1.1 --- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp Sat May 30 15:28:27 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp Sat May 30 18:05:06 2020 +0200
1.3 @@ -29,6 +29,7 @@
1.4 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.5
1.6 <jsp:useBean id="projects" type="java.util.List<de.uapcore.lightpit.entities.Project>" scope="request" />
1.7 +<jsp:useBean id="versions" type="java.util.List<de.uapcore.lightpit.entities.Version>" scope="request" />
1.8 <jsp:useBean id="issue" type="de.uapcore.lightpit.entities.Issue" scope="request"/>
1.9 <jsp:useBean id="issueStatusEnum" type="de.uapcore.lightpit.entities.IssueStatus[]" scope="request"/>
1.10 <jsp:useBean id="issueCategoryEnum" type="de.uapcore.lightpit.entities.IssueCategory[]" scope="request"/>
1.11 @@ -44,13 +45,19 @@
1.12 <tr>
1.13 <th><fmt:message key="issue.project"/></th>
1.14 <td>
1.15 + <c:if test="${issue.project.id ge 0}">
1.16 + <c:out value="${issue.project.name}" />
1.17 + <input type="hidden" name="pid" value="${issue.project.id}" />
1.18 + </c:if>
1.19 + <c:if test="${empty issue.project or issue.project.id lt 0}">
1.20 <select name="pid" required>
1.21 <c:forEach var="project" items="${projects}">
1.22 - <option value="${project.id}" <c:if test="${project eq issue.project}">selected</c:if> >
1.23 + <option value="${project.id}">
1.24 <c:out value="${project.name}" />
1.25 </option>
1.26 </c:forEach>
1.27 </select>
1.28 + </c:if>
1.29 </td>
1.30 </tr>
1.31 <tr>
1.32 @@ -104,45 +111,32 @@
1.33 </select>
1.34 </td>
1.35 </tr>
1.36 + <c:if test="${issue.project.id ge 0}">
1.37 <tr>
1.38 - <th>
1.39 - <c:choose>
1.40 - <c:when test="${issue.affectedVersions.size() gt 1}">
1.41 - <fmt:message key="issue.affected-versions"/>
1.42 - </c:when>
1.43 - <c:otherwise>
1.44 - <fmt:message key="issue.affected-version"/>
1.45 - </c:otherwise>
1.46 - </c:choose>
1.47 - </th>
1.48 - <td>TODO</td>
1.49 + <th class="vtop"><fmt:message key="issue.affected-versions"/></th>
1.50 + <td>
1.51 + <c:set var="fieldname" value="affected"/>
1.52 + <c:set var="data" value="${issue.affectedVersions}" />
1.53 + <%@include file="../jspf/version-list.jsp"%>
1.54 + </td>
1.55 </tr>
1.56 <tr>
1.57 - <th>
1.58 - <c:choose>
1.59 - <c:when test="${issue.scheduledVersions.size() gt 1}">
1.60 - <fmt:message key="issue.scheduled-versions"/>
1.61 - </c:when>
1.62 - <c:otherwise>
1.63 - <fmt:message key="issue.scheduled-version"/>
1.64 - </c:otherwise>
1.65 - </c:choose>
1.66 - </th>
1.67 - <td>TODO</td>
1.68 + <th class="vtop"><fmt:message key="issue.scheduled-versions"/></th>
1.69 + <td>
1.70 + <c:set var="fieldname" value="scheduled"/>
1.71 + <c:set var="data" value="${issue.scheduledVersions}" />
1.72 + <%@include file="../jspf/version-list.jsp"%>
1.73 + </td>
1.74 </tr>
1.75 <tr>
1.76 - <th>
1.77 - <c:choose>
1.78 - <c:when test="${issue.resolvedVersions.size() gt 1}">
1.79 - <fmt:message key="issue.resolved-versions"/>
1.80 - </c:when>
1.81 - <c:otherwise>
1.82 - <fmt:message key="issue.resolved-version"/>
1.83 - </c:otherwise>
1.84 - </c:choose>
1.85 - </th>
1.86 - <td>TODO</td>
1.87 + <th class="vtop"><fmt:message key="issue.resolved-versions"/></th>
1.88 + <td>
1.89 + <c:set var="fieldname" value="resolved"/>
1.90 + <c:set var="data" value="${issue.resolvedVersions}" />
1.91 + <%@include file="../jspf/version-list.jsp"%>
1.92 + </td>
1.93 </tr>
1.94 + </c:if>
1.95 <tr>
1.96 <th><fmt:message key="issue.eta"/></th>
1.97 <td><input name="eta" type="date" value="<fmt:formatDate value="${issue.eta}" pattern="YYYY-MM-dd" />" /> </td>
