Mercurial > hg > LightPIT / file diff

     1.1 --- a/src/main/webapp/WEB-INF/jsp/projects.jsp	Sat Aug 22 18:34:36 2020 +0200
     1.2 +++ b/src/main/webapp/WEB-INF/jsp/projects.jsp	Sun Aug 23 15:10:49 2020 +0200
     1.3 @@ -28,9 +28,9 @@
     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.ProjectIndexView" scope="request"/>
     1.8 +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectView" scope="request"/>
     1.9  
    1.10 -<c:if test="${empty viewmodel.projects}">
    1.11 +<c:if test="${empty viewmodel.projectList}">
    1.12      <div class="info-box">
    1.13          <fmt:message key="no-projects"/>
    1.14      </div>
    1.15 @@ -40,7 +40,7 @@
    1.16      <a href="./projects/edit" class="button"><fmt:message key="button.create"/></a>
    1.17  </div>
    1.18  
    1.19 -<c:if test="${not empty viewmodel.projects}">
    1.20 +<c:if test="${not empty viewmodel.projectList}">
    1.21      <table id="project-list" class="datatable medskip">
    1.22          <colgroup>
    1.23              <col>
    1.24 @@ -65,7 +65,7 @@
    1.25          </tr>
    1.26          </thead>
    1.27          <tbody>
    1.28 -        <c:forEach var="projectInfo" items="${viewmodel.projects}">
    1.29 +        <c:forEach var="projectInfo" items="${viewmodel.projectList}">
    1.30              <c:set var="project" scope="page" value="${projectInfo.project}"/>
    1.31              <tr class="nowrap">
    1.32                  <td style="width: 2em;"><a href="./projects/edit?pid=${project.id}">&#x270e;</a></td>
    1.33 @@ -79,12 +79,12 @@
    1.34                  </td>
    1.35                  <td class="hright">
    1.36                      <c:if test="${not empty projectInfo.latestVersion}">
    1.37 -                        <a href="./projects/versions/view?vid=${projectInfo.latestVersion.id}"><c:out value="${projectInfo.latestVersion.name}"/></a>
    1.38 +                        <a href="./projects/view?pid=${project.id}&vid=${projectInfo.latestVersion.id}"><c:out value="${projectInfo.latestVersion.name}"/></a>
    1.39                      </c:if>
    1.40                  </td>
    1.41                  <td class="hright">
    1.42                      <c:if test="${not empty projectInfo.nextVersion}">
    1.43 -                        <a href="./projects/versions/view?vid=${projectInfo.nextVersion.id}"><c:out value="${projectInfo.nextVersion.name}"/></a>
    1.44 +                        <a href="./projects/view?pid=${project.id}&vid=${projectInfo.nextVersion.id}"><c:out value="${projectInfo.nextVersion.name}"/></a>
    1.45                      </c:if>
    1.46                  </td>
    1.47                  <td class="hright">${projectInfo.issueSummary.open}</td>