1.1 --- a/src/main/webapp/WEB-INF/jsp/project-details.jsp Sat Jan 23 14:47:59 2021 +0100
1.2 +++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp Fri Apr 02 11:59:14 2021 +0200
1.3 @@ -24,37 +24,28 @@
1.4 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1.5 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1.6 --%>
1.7 -<%@page pageEncoding="UTF-8" import="de.uapcore.lightpit.viewmodel.ProjectView" %>
1.8 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1.9 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.10 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
1.11
1.12 -<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectDetailsView" scope="request" />
1.13 +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectDetails" scope="request" />
1.14
1.15 <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/>
1.16 -<c:set var="component" scope="page" value="${viewmodel.componentFilter}"/>
1.17 +<c:set var="component" scope="page" value="${viewmodel.component}"/>
1.18 +<c:set var="version" scope="page" value="${viewmodel.version}"/>
1.19 <%@include file="../jspf/project-header.jspf"%>
1.20
1.21 <div id="tool-area">
1.22 - <c:remove var="createIssueParams"/>
1.23 - <c:if test="${viewmodel.versionFilter.id gt 0}">
1.24 - <c:set var="createIssueParams">&vid=${viewmodel.versionFilter.id}</c:set>
1.25 + <a href="./projects/${project.node}/issues/${empty version ? '-' : version.node}/${empty component ? '-' : component.node}/-/create" class="button"><fmt:message key="button.issue.create"/></a>
1.26 + <a href="./projects/${project.node}/edit" class="button"><fmt:message key="button.project.edit"/></a>
1.27 + <c:if test="${not empty version}">
1.28 + <a href="./projects/${project.node}/versions/${version.node}/edit" class="button"><fmt:message key="button.version.edit"/></a>
1.29 </c:if>
1.30 - <c:if test="${viewmodel.componentFilter.id gt 0}">
1.31 - <c:set var="createIssueParams">${createIssueParams}&cid=${viewmodel.componentFilter.id}</c:set>
1.32 + <a href="./projects/${project.node}/versions/-/create" class="button"><fmt:message key="button.version.create"/></a>
1.33 + <c:if test="${not empty component}">
1.34 + <a href="./projects/${project.node}/components/${component.node}/edit" class="button"><fmt:message key="button.component.edit"/></a>
1.35 </c:if>
1.36 - <c:if test="${not empty createIssueParams}">
1.37 - <c:set var="createIssueParams">?${fn:substringAfter(createIssueParams, "&")}</c:set>
1.38 - </c:if>
1.39 - <a href="./projects/${project.node}/create-issue${createIssueParams}" class="button"><fmt:message key="button.issue.create"/></a>
1.40 - <c:if test="${viewmodel.versionFilter.id gt 0}">
1.41 - <a href="./projects/${project.node}/versions/${viewmodel.versionFilter.node}/edit" class="button"><fmt:message key="button.version.edit"/></a>
1.42 - </c:if>
1.43 - <a href="./projects/${project.node}/create-version" class="button"><fmt:message key="button.version.create"/></a>
1.44 - <c:if test="${viewmodel.componentFilter.id gt 0}">
1.45 - <a href="./projects/${project.node}/components/${viewmodel.componentFilter.node}/edit" class="button"><fmt:message key="button.component.edit"/></a>
1.46 - </c:if>
1.47 - <a href="./projects/${project.node}/create-component" class="button"><fmt:message key="button.component.create"/></a>
1.48 + <a href="./projects/${project.node}/components/-/create" class="button"><fmt:message key="button.component.create"/></a>
1.49 </div>
1.50
1.51 <h2><fmt:message key="progress" /></h2>
1.52 @@ -63,24 +54,19 @@
1.53 <%@include file="../jspf/issue-summary.jspf"%>
1.54
1.55 <c:choose>
1.56 - <c:when test="${viewmodel.versionFilter eq ProjectView.NO_VERSION or viewmodel.versionFilter eq ProjectView.ALL_VERSIONS}">
1.57 + <c:when test="${empty viewmodel.versionInfo}">
1.58 <h2>
1.59 - <c:if test="${viewmodel.versionFilter eq ProjectView.NO_VERSION}">
1.60 - <fmt:message key="issue.without-version" />
1.61 - </c:if>
1.62 - <c:if test="${viewmodel.versionFilter ne ProjectView.NO_VERSION}">
1.63 - <fmt:message key="issues" />
1.64 - </c:if>
1.65 + <fmt:message key="issues" />
1.66 </h2>
1.67 - <c:set var="summary" value="${viewmodel.projectDetails.issueSummary}"/>
1.68 - <c:set var="issues" value="${viewmodel.projectDetails.issues}"/>
1.69 + <c:set var="summary" value="${viewmodel.issueSummary}"/>
1.70 + <c:set var="issues" value="${viewmodel.issues}"/>
1.71 <%@include file="../jspf/issue-summary.jspf"%>
1.72 <c:if test="${not empty issues}">
1.73 <%@include file="../jspf/issue-list.jspf"%>
1.74 </c:if>
1.75 </c:when>
1.76 <c:otherwise>
1.77 - <c:set var="versionInfo" value="${viewmodel.projectDetails.versionInfo}"/>
1.78 + <c:set var="versionInfo" value="${viewmodel.versionInfo}"/>
1.79 <h2>
1.80 <fmt:message key="version" /> <c:out value="${versionInfo.version.name}" /> - <fmt:message key="version.status.${versionInfo.version.status}"/>
1.81 </h2>
