1.1 --- a/src/main/webapp/WEB-INF/jsp/version-form.jsp Sat May 23 13:34:41 2020 +0200 1.2 +++ b/src/main/webapp/WEB-INF/jsp/version-form.jsp Sat May 23 13:52:04 2020 +0200 1.3 @@ -25,17 +25,14 @@ 1.4 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 1.5 --%> 1.6 <%@page pageEncoding="UTF-8" %> 1.7 -<%@page import="de.uapcore.lightpit.Constants" %> 1.8 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 1.9 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> 1.10 1.11 -<c:set scope="page" var="moduleInfo" value="${requestScope[Constants.REQ_ATTR_MODULE_INFO]}"/> 1.12 - 1.13 <jsp:useBean id="projects" type="java.util.List<de.uapcore.lightpit.entities.Project>" scope="request" /> 1.14 <jsp:useBean id="version" type="de.uapcore.lightpit.entities.Version" scope="request"/> 1.15 <jsp:useBean id="versionStatusEnum" type="de.uapcore.lightpit.entities.VersionStatus[]" scope="request"/> 1.16 1.17 -<form action="./${moduleInfo.modulePath}/versions/commit" method="post"> 1.18 +<form action="./projects/versions/commit" method="post"> 1.19 <table class="formtable" style="width: 35ch"> 1.20 <colgroup> 1.21 <col> 1.22 @@ -83,10 +80,10 @@ 1.23 <input type="hidden" name="id" value="${version.id}"/> 1.24 <c:choose> 1.25 <c:when test="${not empty version.project and version.project.id ge 0}"> 1.26 - <c:set var="cancelUrl">./${moduleInfo.modulePath}/view?pid=${version.project.id}</c:set> 1.27 + <c:set var="cancelUrl">./projects/view?pid=${version.project.id}</c:set> 1.28 </c:when> 1.29 <c:otherwise> 1.30 - <c:set var="cancelUrl">./${moduleInfo.modulePath}/</c:set> 1.31 + <c:set var="cancelUrl">./projects/</c:set> 1.32 </c:otherwise> 1.33 </c:choose> 1.34 <a href="${cancelUrl}" class="button">