1.1 --- a/src/main/webapp/WEB-INF/jsp/issues.jsp Sat May 30 18:12:38 2020 +0200 1.2 +++ b/src/main/webapp/WEB-INF/jsp/issues.jsp Mon Jun 01 14:46:58 2020 +0200 1.3 @@ -28,60 +28,26 @@ 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="issues" type="java.util.List<de.uapcore.lightpit.entities.Issue>" scope="request"/> 1.8 +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.IssuesView" scope="request"/> 1.9 +<c:set var="project" scope="page" value="${viewmodel.project}"/> 1.10 +<c:set var="version" scope="page" value="${viewmodel.version}"/> 1.11 +<%@include file="../jspf/project-header.jsp"%> 1.12 + 1.13 +<c:if test="${not empty version}"> 1.14 + <h2> 1.15 + <fmt:message key="version.label" /> <c:out value="${version.name}" /> - <fmt:message key="version.status.${version.status}"/> 1.16 + <a href="./projects/versions/edit?vid=${version.id}">✎</a> 1.17 + </h2> 1.18 +</c:if> 1.19 1.20 <div id="tool-area"> 1.21 <div> 1.22 <a href="./projects/issues/edit" class="button"><fmt:message key="button.issue.create"/></a> 1.23 + <c:if test="${not empty version}"> 1.24 + <a href="./projects/issues/?pid=${project.id}&vid=-1" class="button"><fmt:message key="button.issue.all"/></a> 1.25 + </c:if> 1.26 </div> 1.27 </div> 1.28 1.29 -<table id="issue-list" class="datatable medskip"> 1.30 - <thead> 1.31 - <tr> 1.32 - <th><fmt:message key="issue.subject"/></th> 1.33 - <th><fmt:message key="issue.assignee"/></th> 1.34 - <th><fmt:message key="issue.category"/></th> 1.35 - <th><fmt:message key="issue.status"/></th> 1.36 - <th><fmt:message key="issue.created"/></th> 1.37 - <th><fmt:message key="issue.updated"/></th> 1.38 - <th><fmt:message key="issue.eta"/></th> 1.39 - </tr> 1.40 - </thead> 1.41 - <tbody> 1.42 - <c:forEach var="issue" items="${issues}"> 1.43 - <tr> 1.44 - <td> 1.45 - <span class="phase-${issue.status.phase}"> 1.46 - <a href="./projects/issues/edit?id=${issue.id}"> 1.47 - <c:out value="${issue.subject}" /> 1.48 - </a> 1.49 - </span> 1.50 - </td> 1.51 - <td> 1.52 - <c:if test="${not empty issue.assignee}"> 1.53 - <c:out value="${issue.assignee.shortDisplayname}" /> 1.54 - </c:if> 1.55 - <c:if test="${empty issue.assignee}"> 1.56 - <fmt:message key="placeholder.null-assignee" /> 1.57 - </c:if> 1.58 - </td> 1.59 - <td> 1.60 - <fmt:message key="issue.category.${issue.category}" /> 1.61 - </td> 1.62 - <td> 1.63 - <fmt:message key="issue.status.${issue.status}" /> 1.64 - </td> 1.65 - <td> 1.66 - <fmt:formatDate value="${issue.created}" type="BOTH"/> 1.67 - </td> 1.68 - <td> 1.69 - <fmt:formatDate value="${issue.updated}" type="BOTH"/> 1.70 - </td> 1.71 - <td> 1.72 - <fmt:formatDate value="${issue.eta}" /> 1.73 - </td> 1.74 - </tr> 1.75 - </c:forEach> 1.76 - </tbody> 1.77 -</table> 1.78 +<c:set var="issues" value="${viewmodel.issues}"/> 1.79 +<%@include file="../jspf/issue-list.jsp"%> 1.80 \ No newline at end of file