1.1 --- a/src/main/webapp/WEB-INF/jsp/version-form.jsp Fri May 22 21:23:57 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/version-form.jsp Sat May 23 13:24:49 2020 +0200
1.3 @@ -30,8 +30,8 @@
1.4 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.5
1.6 <c:set scope="page" var="moduleInfo" value="${requestScope[Constants.REQ_ATTR_MODULE_INFO]}"/>
1.7 -<c:set scope="page" var="selectedProject" value="${sessionScope[ProjectsModule.SESSION_ATTR_SELECTED_PROJECT]}"/>
1.8
1.9 +<jsp:useBean id="projects" type="java.util.List<de.uapcore.lightpit.entities.Project>" scope="request" />
1.10 <jsp:useBean id="version" type="de.uapcore.lightpit.entities.Version" scope="request"/>
1.11 <jsp:useBean id="versionStatusEnum" type="de.uapcore.lightpit.entities.VersionStatus[]" scope="request"/>
1.12
1.13 @@ -43,6 +43,18 @@
1.14 </colgroup>
1.15 <tbody>
1.16 <tr>
1.17 + <th><fmt:message key="thead.version.project"/></th>
1.18 + <td>
1.19 + <select name="pid" required>
1.20 + <c:forEach var="project" items="${projects}">
1.21 + <option value="${project.id}" <c:if test="${project eq version.project}">selected</c:if> >
1.22 + <c:out value="${project.name}" />
1.23 + </option>
1.24 + </c:forEach>
1.25 + </select>
1.26 + </td>
1.27 + </tr>
1.28 + <tr>
1.29 <th><fmt:message key="thead.version.name"/></th>
1.30 <td><input name="name" type="text" maxlength="20" required value="<c:out value="${version.name}"/>" /></td>
1.31 </tr>
1.32 @@ -69,7 +81,15 @@
1.33 <tr>
1.34 <td colspan="2">
1.35 <input type="hidden" name="id" value="${version.id}"/>
1.36 - <a href="./${moduleInfo.modulePath}/view?pid=${version.project.id}" class="button">
1.37 + <c:choose>
1.38 + <c:when test="${not empty version.project and version.project.id ge 0}">
1.39 + <c:set var="cancelUrl">./${moduleInfo.modulePath}/view?pid=${version.project.id}</c:set>
1.40 + </c:when>
1.41 + <c:otherwise>
1.42 + <c:set var="cancelUrl">./${moduleInfo.modulePath}/</c:set>
1.43 + </c:otherwise>
1.44 + </c:choose>
1.45 + <a href="${cancelUrl}" class="button">
1.46 <fmt:message bundle="${lightpit_bundle}" key="button.cancel"/>
1.47 </a>
1.48 <button type="submit"><fmt:message bundle="${lightpit_bundle}" key="button.okay"/></button>
