1.1 --- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp Fri Oct 23 12:38:20 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp Fri Oct 23 13:29:33 2020 +0200
1.3 @@ -169,56 +169,20 @@
1.4 <tr>
1.5 <td colspan="2">
1.6 <input type="hidden" name="id" value="${issue.id}"/>
1.7 - <%-- TODO: fix #14 --%>
1.8 - <a href="./projects/${issue.project.node}/all-components/all-versions/issues/" class="button">
1.9 + <c:if test="${issue.id ge 0}">
1.10 + <a href="./projects/${issue.project.node}/issues/${issue.id}/view" class="button">
1.11 <fmt:message bundle="${lightpit_bundle}" key="button.cancel"/>
1.12 </a>
1.13 + </c:if>
1.14 + <c:if test="${issue.id lt 0}">
1.15 + <%-- TODO: fix #14 --%>
1.16 + <a href="./projects/${issue.project.node}/all-components/all-versions/issues/" class="button">
1.17 + <fmt:message bundle="${lightpit_bundle}" key="button.cancel"/>
1.18 + </a>
1.19 + </c:if>
1.20 <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay"/></button>
1.21 </td>
1.22 </tr>
1.23 </tfoot>
1.24 </table>
1.25 </form>
1.26 -<hr class="comments-separator"/>
1.27 -<h2><fmt:message key="issue.comments"/></h2>
1.28 -<c:if test="${viewmodel.issue.id ge 0}">
1.29 -<form id="comment-form" action="./projects/commit-issue-comment" method="post">
1.30 - <table class="formtable fullwidth">
1.31 - <tbody>
1.32 - <tr>
1.33 - <td><textarea rows="5" name="comment" required></textarea></td>
1.34 - </tr>
1.35 - </tbody>
1.36 - <tfoot>
1.37 - <tr>
1.38 - <td>
1.39 - <input type="hidden" name="issueid" value="${issue.id}"/>
1.40 - <button type="submit"><fmt:message key="button.comment"/></button>
1.41 - </td>
1.42 - </tr>
1.43 - </tfoot>
1.44 - </table>
1.45 -</form>
1.46 - <c:forEach var="comment" items="${viewmodel.comments}">
1.47 - <div class="comment">
1.48 - <div class="caption">
1.49 - <c:if test="${not empty comment.author}">
1.50 - <c:out value="${comment.author.displayname}"/>
1.51 - </c:if>
1.52 - <c:if test="${empty comment.author}">
1.53 - <fmt:message key="issue.comments.anonauthor"/>
1.54 - </c:if>
1.55 - </div>
1.56 - <div class="smalltext">
1.57 - <fmt:formatDate type="BOTH" value="${comment.created}" />
1.58 - <c:if test="${comment.updateCount gt 0}">
1.59 - <!-- TODO: update count -->
1.60 - </c:if>
1.61 - </div>
1.62 - <div class="medskip">
1.63 - <c:out value="${comment.comment}"/>
1.64 - </div>
1.65 - </div>
1.66 - </c:forEach>
1.67 -</c:if>
1.68 -
