--- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp Fri Oct 23 12:38:20 2020 +0200 +++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp Fri Oct 23 13:29:33 2020 +0200 @@ -169,56 +169,20 @@ <tr> <td colspan="2"> <input type="hidden" name="id" value="${issue.id}"/> - <%-- TODO: fix #14 --%> - <a href="./projects/${issue.project.node}/all-components/all-versions/issues/" class="button"> + <c:if test="${issue.id ge 0}"> + <a href="./projects/${issue.project.node}/issues/${issue.id}/view" class="button"> <fmt:message bundle="${lightpit_bundle}" key="button.cancel"/> </a> + </c:if> + <c:if test="${issue.id lt 0}"> + <%-- TODO: fix #14 --%> + <a href="./projects/${issue.project.node}/all-components/all-versions/issues/" class="button"> + <fmt:message bundle="${lightpit_bundle}" key="button.cancel"/> + </a> + </c:if> <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay"/></button> </td> </tr> </tfoot> </table> </form> -<hr class="comments-separator"/> -<h2><fmt:message key="issue.comments"/></h2> -<c:if test="${viewmodel.issue.id ge 0}"> -<form id="comment-form" action="./projects/commit-issue-comment" method="post"> - <table class="formtable fullwidth"> - <tbody> - <tr> - <td><textarea rows="5" name="comment" required></textarea></td> - </tr> - </tbody> - <tfoot> - <tr> - <td> - <input type="hidden" name="issueid" value="${issue.id}"/> - <button type="submit"><fmt:message key="button.comment"/></button> - </td> - </tr> - </tfoot> - </table> -</form> - <c:forEach var="comment" items="${viewmodel.comments}"> - <div class="comment"> - <div class="caption"> - <c:if test="${not empty comment.author}"> - <c:out value="${comment.author.displayname}"/> - </c:if> - <c:if test="${empty comment.author}"> - <fmt:message key="issue.comments.anonauthor"/> - </c:if> - </div> - <div class="smalltext"> - <fmt:formatDate type="BOTH" value="${comment.created}" /> - <c:if test="${comment.updateCount gt 0}"> - <!-- TODO: update count --> - </c:if> - </div> - <div class="medskip"> - <c:out value="${comment.comment}"/> - </div> - </div> - </c:forEach> -</c:if> -