1.1 --- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp Thu Oct 15 18:36:05 2020 +0200 1.2 +++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp Thu Oct 15 20:02:30 2020 +0200 1.3 @@ -31,7 +31,8 @@ 1.4 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.IssueEditView" scope="request"/> 1.5 <c:set var="issue" scope="page" value="${viewmodel.issue}" /> 1.6 1.7 -<form action="./projects/issues/commit" method="post"> 1.8 +<%-- TODO: change to ./issues/commit --%> 1.9 +<form action="./projects/commit-issue" method="post"> 1.10 <table class="formtable fullwidth"> 1.11 <colgroup> 1.12 <col> 1.13 @@ -152,15 +153,8 @@ 1.14 <tr> 1.15 <td colspan="2"> 1.16 <input type="hidden" name="id" value="${issue.id}"/> 1.17 - <c:choose> 1.18 - <c:when test="${not empty issue.project}"> 1.19 - <c:set var="cancelUrl">./projects/view?pid=${issue.project.id}</c:set> 1.20 - </c:when> 1.21 - <c:otherwise> 1.22 - <c:set var="cancelUrl">./projects/</c:set> 1.23 - </c:otherwise> 1.24 - </c:choose> 1.25 - <a href="${cancelUrl}" class="button"> 1.26 + <%-- TODO: fix #14 --%> 1.27 + <a href="./projects/${issue.project.id}/versions/" class="button"> 1.28 <fmt:message bundle="${lightpit_bundle}" key="button.cancel"/> 1.29 </a> 1.30 <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay"/></button> 1.31 @@ -172,7 +166,7 @@ 1.32 <hr class="comments-separator"/> 1.33 <h2><fmt:message key="issue.comments"/></h2> 1.34 <c:if test="${viewmodel.issue.id ge 0}"> 1.35 -<form id="comment-form" action="./projects/issues/comment" method="post"> 1.36 +<form id="comment-form" action="./projects/commit-issue-comment" method="post"> 1.37 <table class="formtable fullwidth"> 1.38 <tbody> 1.39 <tr>