Mercurial > hg > LightPIT / file diff

     1.1 --- a/src/main/webapp/WEB-INF/jsp/users.jsp	Sat May 30 18:12:38 2020 +0200
     1.2 +++ b/src/main/webapp/WEB-INF/jsp/users.jsp	Mon Jun 01 14:46:58 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="users" type="java.util.List<de.uapcore.lightpit.entities.User>" scope="request"/>
     1.8 +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.UsersView" scope="request"/>
     1.9  
    1.10 -<c:if test="${empty users}">
    1.11 +<c:if test="${empty viewmodel.users}">
    1.12      <div class="info-box">
    1.13          <fmt:message key="no-users"/>
    1.14      </div>
    1.15 @@ -40,7 +40,7 @@
    1.16      <a href="./teams/edit" class="button"><fmt:message key="button.create"/></a>
    1.17  </div>
    1.18  
    1.19 -<c:if test="${not empty users}">
    1.20 +<c:if test="${not empty viewmodel.users}">
    1.21      <table class="datatable medskip">
    1.22          <thead>
    1.23          <tr>
    1.24 @@ -49,7 +49,7 @@
    1.25          </tr>
    1.26          </thead>
    1.27          <tbody>
    1.28 -        <c:forEach var="user" items="${users}">
    1.29 +        <c:forEach var="user" items="${viewmodel.users}">
    1.30              <tr>
    1.31                  <td><a href="./teams/edit?id=${user.id}">&#x270e;</a></td>
    1.32                  <td><c:out value="${user.displayname}"/></td>