1.1 --- a/src/main/webapp/WEB-INF/jsp/project-details.jsp Sat Aug 29 16:48:15 2020 +0200 1.2 +++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp Sat Aug 29 17:13:09 2020 +0200 1.3 @@ -34,6 +34,9 @@ 1.4 <%@include file="../jspf/project-header.jsp"%> 1.5 1.6 <div id="tool-area"> 1.7 + <c:if test="${not empty viewmodel.versionFilter}"> 1.8 + <a href="./projects/versions/edit?vid=${viewmodel.versionFilter.id}" class="button"><fmt:message key="button.version.edit"/></a> 1.9 + </c:if> 1.10 <a href="./projects/versions/edit" class="button"><fmt:message key="button.version.create"/></a> 1.11 <a href="./projects/issues/edit?pid=${project.id}" class="button"><fmt:message key="button.issue.create"/></a> 1.12 </div> 1.13 @@ -43,14 +46,8 @@ 1.14 <c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" /> 1.15 <%@include file="../jspf/issue-summary.jsp"%> 1.16 1.17 -<h2><fmt:message key="issue.without-version" /></h2> 1.18 - 1.19 -<c:set var="issues" value="${viewmodel.projectDetails.issuesWithoutVersion}"/> 1.20 -<c:set var="summary" value="${viewmodel.projectDetails.issuesWithoutVersionTotal}" /> 1.21 -<%@include file="../jspf/issue-summary.jsp"%> 1.22 -<%@include file="../jspf/issue-list.jsp"%> 1.23 - 1.24 -<c:forEach var="versionInfo" items="${viewmodel.projectDetails.versionInfos}"> 1.25 +<c:if test="${not empty viewmodel.versionFilter}"> 1.26 + <c:set var="versionInfo" value="${viewmodel.projectDetails.versionInfo}"/> 1.27 <h2> 1.28 <fmt:message key="version.label" /> <c:out value="${versionInfo.version.name}" /> - <fmt:message key="version.status.${versionInfo.version.status}"/> 1.29 </h2> 1.30 @@ -70,4 +67,15 @@ 1.31 <%@include file="../jspf/issue-summary.jsp"%> 1.32 <%@include file="../jspf/issue-list.jsp"%> 1.33 </c:if> 1.34 -</c:forEach> 1.35 \ No newline at end of file 1.36 +</c:if> 1.37 +<c:if test="${empty viewmodel.versionFilter}"> 1.38 + <h2> 1.39 + <fmt:message key="issue.without-version" /> 1.40 + </h2> 1.41 + <c:set var="summary" value="${viewmodel.projectDetails.issueSummary}"/> 1.42 + <c:set var="issues" value="${viewmodel.projectDetails.issues}"/> 1.43 + <%@include file="../jspf/issue-summary.jsp"%> 1.44 + <c:if test="${not empty issues}"> 1.45 + <%@include file="../jspf/issue-list.jsp"%> 1.46 + </c:if> 1.47 +</c:if>