1.1 --- a/src/main/webapp/WEB-INF/jsp/version-form.jsp Sat May 30 18:12:38 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/version-form.jsp Mon Jun 01 14:46:58 2020 +0200
1.3 @@ -28,14 +28,8 @@
1.4 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1.5 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.6
1.7 -<jsp:useBean id="projects" type="java.util.List<de.uapcore.lightpit.entities.Project>" scope="request" />
1.8 -<jsp:useBean id="version" type="de.uapcore.lightpit.entities.Version" scope="request"/>
1.9 -<jsp:useBean id="versionStatusEnum" type="de.uapcore.lightpit.entities.VersionStatus[]" scope="request"/>
1.10 -
1.11 -<jsp:useBean id="statsAffected" type="de.uapcore.lightpit.entities.VersionStatistics" scope="request"/>
1.12 -<jsp:useBean id="statsScheduled" type="de.uapcore.lightpit.entities.VersionStatistics" scope="request"/>
1.13 -<jsp:useBean id="statsResolved" type="de.uapcore.lightpit.entities.VersionStatistics" scope="request"/>
1.14 -<jsp:useBean id="statsHideZeros" type="java.lang.Boolean" scope="request"/>
1.15 +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.VersionEditView" scope="request" />
1.16 +<c:set var="version" scope="page" value="${viewmodel.version}"/>
1.17
1.18 <form action="./projects/versions/commit" method="post">
1.19 <table class="formtable" style="width: 35ch">
1.20 @@ -47,19 +41,21 @@
1.21 <tr>
1.22 <th><fmt:message key="version.project"/></th>
1.23 <td>
1.24 - <c:if test="${version.project.id ge 0}">
1.25 - <c:out value="${version.project.name}" />
1.26 - <input type="hidden" name="pid" value="${version.project.id}" />
1.27 - </c:if>
1.28 - <c:if test="${empty version.project or version.project.id lt 0}">
1.29 - <select name="pid" required>
1.30 - <c:forEach var="project" items="${projects}">
1.31 - <option value="${project.id}">
1.32 - <c:out value="${project.name}" />
1.33 - </option>
1.34 - </c:forEach>
1.35 - </select>
1.36 - </c:if>
1.37 + <c:choose>
1.38 + <c:when test="${not empty version.project}">
1.39 + <c:out value="${version.project.name}" />
1.40 + <input type="hidden" name="pid" value="${version.project.id}" />
1.41 + </c:when>
1.42 + <c:otherwise>
1.43 + <select name="pid" required>
1.44 + <c:forEach var="project" items="${viewmodel.projects}">
1.45 + <option value="${project.id}">
1.46 + <c:out value="${project.name}" />
1.47 + </option>
1.48 + </c:forEach>
1.49 + </select>
1.50 + </c:otherwise>
1.51 + </c:choose>
1.52 </td>
1.53 </tr>
1.54 <tr>
1.55 @@ -70,7 +66,7 @@
1.56 <th><fmt:message key="version.status"/></th>
1.57 <td>
1.58 <select name="status" required>
1.59 - <c:forEach var="elem" items="${versionStatusEnum}">
1.60 + <c:forEach var="elem" items="${viewmodel.versionStatus}">
1.61 <option
1.62 <c:if test="${elem eq version.status}">selected</c:if> value="${elem}"><fmt:message
1.63 key="version.status.${elem}"/></option>
1.64 @@ -90,7 +86,7 @@
1.65 <td colspan="2">
1.66 <input type="hidden" name="id" value="${version.id}"/>
1.67 <c:choose>
1.68 - <c:when test="${not empty version.project and version.project.id ge 0}">
1.69 + <c:when test="${not empty version.project}">
1.70 <c:set var="cancelUrl">./projects/view?pid=${version.project.id}</c:set>
1.71 </c:when>
1.72 <c:otherwise>
