1.1 --- a/src/main/webapp/WEB-INF/jsp/user-form.jsp Sat Jan 23 14:47:59 2021 +0100 1.2 +++ b/src/main/webapp/WEB-INF/jsp/user-form.jsp Fri Apr 02 11:59:14 2021 +0200 1.3 @@ -28,10 +28,10 @@ 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.UsersEditView" scope="request"/> 1.8 +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.UserEditView" scope="request"/> 1.9 <c:set var="user" scope="page" value="${viewmodel.user}" /> 1.10 1.11 -<form action="./teams/commit" method="post"> 1.12 +<form action="./users/-/commit" method="post"> 1.13 <table class="formtable"> 1.14 <colgroup> 1.15 <col> 1.16 @@ -57,10 +57,19 @@ 1.17 </tr> 1.18 </tbody> 1.19 <tfoot> 1.20 + <c:if test="${not empty viewmodel.errorText}"> 1.21 + <tr> 1.22 + <td colspan="2"> 1.23 + <div class="error-box"> 1.24 + <fmt:message key="${viewmodel.errorText}"/> 1.25 + </div> 1.26 + </td> 1.27 + </tr> 1.28 + </c:if> 1.29 <tr> 1.30 <td colspan="2"> 1.31 <input type="hidden" name="userid" value="${user.id}"/> 1.32 - <a href="./teams/" class="button"> 1.33 + <a href="./users/" class="button"> 1.34 <fmt:message key="button.cancel"/> 1.35 </a> 1.36 <button type="submit"><fmt:message key="button.okay"/></button>