Mercurial > hg > LightPIT / file diff

--- a/src/main/webapp/WEB-INF/jsp/projects.jsp	Sat Jan 23 14:47:59 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/projects.jsp	Fri Apr 02 11:59:14 2021 +0200
@@ -28,19 +28,19 @@
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
-<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectView" scope="request"/>
+<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectsView" scope="request"/>
 
-<c:if test="${empty viewmodel.projectList}">
+<c:if test="${empty viewmodel.projects}">
     <div class="info-box">
         <fmt:message key="no-projects"/>
     </div>
 </c:if>
 
 <div id="tool-area">
-    <a href="./projects/create" class="button"><fmt:message key="button.project.create"/></a>
+    <a href="./projects/-/create" class="button"><fmt:message key="button.project.create"/></a>
 </div>
 
-<c:if test="${not empty viewmodel.projectList}">
+<c:if test="${not empty viewmodel.projects}">
     <table id="project-list" class="datatable medskip">
         <colgroup>
             <col>
@@ -65,11 +65,11 @@
         </tr>
         </thead>
         <tbody>
-        <c:forEach var="projectInfo" items="${viewmodel.projectList}">
+        <c:forEach var="projectInfo" items="${viewmodel.projects}">
             <c:set var="project" scope="page" value="${projectInfo.project}"/>
             <tr class="nowrap">
                 <td style="width: 2em;"><a href="./projects/${project.node}/edit">&#x270e;</a></td>
-                <td><a href="./projects/${project.node}/versions/"><c:out value="${project.name}"/></a>
+                <td><a href="./projects/${project.node}"><c:out value="${project.name}"/></a>
                 </td>
                 <td>
                     <c:if test="${not empty project.repoUrl}">
@@ -79,12 +79,12 @@
                 </td>
                 <td class="hright">
                     <c:if test="${not empty projectInfo.latestVersion}">
-                        <a href="./projects/${project.node}/all-components/${projectInfo.latestVersion.node}/issues/"><c:out value="${projectInfo.latestVersion.name}"/></a>
+                        <a href="./projects/${project.node}/issues/${projectInfo.latestVersion.node}/-/"><c:out value="${projectInfo.latestVersion.name}"/></a>
                     </c:if>
                 </td>
                 <td class="hright">
                     <c:if test="${not empty projectInfo.nextVersion}">
-                        <a href="./projects/${project.node}/all-components/${projectInfo.nextVersion.node}/issues/"><c:out value="${projectInfo.nextVersion.name}"/></a>
+                        <a href="./projects/${project.node}/issues/${projectInfo.nextVersion.node}/-/"><c:out value="${projectInfo.nextVersion.name}"/></a>
                     </c:if>
                 </td>
                 <td class="hright">${projectInfo.issueSummary.open}</td>