Mercurial > hg > LightPIT / file diff

     1.1 --- a/src/main/webapp/WEB-INF/jsp/projects.jsp	Sat Jan 23 14:47:59 2021 +0100
     1.2 +++ b/src/main/webapp/WEB-INF/jsp/projects.jsp	Fri Apr 02 11:59:14 2021 +0200
     1.3 @@ -28,19 +28,19 @@
     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="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectView" scope="request"/>
     1.8 +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectsView" scope="request"/>
     1.9  
    1.10 -<c:if test="${empty viewmodel.projectList}">
    1.11 +<c:if test="${empty viewmodel.projects}">
    1.12      <div class="info-box">
    1.13          <fmt:message key="no-projects"/>
    1.14      </div>
    1.15  </c:if>
    1.16  
    1.17  <div id="tool-area">
    1.18 -    <a href="./projects/create" class="button"><fmt:message key="button.project.create"/></a>
    1.19 +    <a href="./projects/-/create" class="button"><fmt:message key="button.project.create"/></a>
    1.20  </div>
    1.21  
    1.22 -<c:if test="${not empty viewmodel.projectList}">
    1.23 +<c:if test="${not empty viewmodel.projects}">
    1.24      <table id="project-list" class="datatable medskip">
    1.25          <colgroup>
    1.26              <col>
    1.27 @@ -65,11 +65,11 @@
    1.28          </tr>
    1.29          </thead>
    1.30          <tbody>
    1.31 -        <c:forEach var="projectInfo" items="${viewmodel.projectList}">
    1.32 +        <c:forEach var="projectInfo" items="${viewmodel.projects}">
    1.33              <c:set var="project" scope="page" value="${projectInfo.project}"/>
    1.34              <tr class="nowrap">
    1.35                  <td style="width: 2em;"><a href="./projects/${project.node}/edit">&#x270e;</a></td>
    1.36 -                <td><a href="./projects/${project.node}/versions/"><c:out value="${project.name}"/></a>
    1.37 +                <td><a href="./projects/${project.node}"><c:out value="${project.name}"/></a>
    1.38                  </td>
    1.39                  <td>
    1.40                      <c:if test="${not empty project.repoUrl}">
    1.41 @@ -79,12 +79,12 @@
    1.42                  </td>
    1.43                  <td class="hright">
    1.44                      <c:if test="${not empty projectInfo.latestVersion}">
    1.45 -                        <a href="./projects/${project.node}/all-components/${projectInfo.latestVersion.node}/issues/"><c:out value="${projectInfo.latestVersion.name}"/></a>
    1.46 +                        <a href="./projects/${project.node}/issues/${projectInfo.latestVersion.node}/-/"><c:out value="${projectInfo.latestVersion.name}"/></a>
    1.47                      </c:if>
    1.48                  </td>
    1.49                  <td class="hright">
    1.50                      <c:if test="${not empty projectInfo.nextVersion}">
    1.51 -                        <a href="./projects/${project.node}/all-components/${projectInfo.nextVersion.node}/issues/"><c:out value="${projectInfo.nextVersion.name}"/></a>
    1.52 +                        <a href="./projects/${project.node}/issues/${projectInfo.nextVersion.node}/-/"><c:out value="${projectInfo.nextVersion.name}"/></a>
    1.53                      </c:if>
    1.54                  </td>
    1.55                  <td class="hright">${projectInfo.issueSummary.open}</td>