--- a/src/main/webapp/WEB-INF/jsp/users.jsp Sat May 30 18:12:38 2020 +0200 +++ b/src/main/webapp/WEB-INF/jsp/users.jsp Mon Jun 01 14:46:58 2020 +0200 @@ -28,9 +28,9 @@ <%@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="users" type="java.util.List<de.uapcore.lightpit.entities.User>" scope="request"/> +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.UsersView" scope="request"/> -<c:if test="${empty users}"> +<c:if test="${empty viewmodel.users}"> <div class="info-box"> <fmt:message key="no-users"/> </div> @@ -40,7 +40,7 @@ <a href="./teams/edit" class="button"><fmt:message key="button.create"/></a> </div> -<c:if test="${not empty users}"> +<c:if test="${not empty viewmodel.users}"> <table class="datatable medskip"> <thead> <tr> @@ -49,7 +49,7 @@ </tr> </thead> <tbody> - <c:forEach var="user" items="${users}"> + <c:forEach var="user" items="${viewmodel.users}"> <tr> <td><a href="./teams/edit?id=${user.id}">✎</a></td> <td><c:out value="${user.displayname}"/></td>