Mercurial > hg > LightPIT / file diff

--- a/src/main/webapp/WEB-INF/jsp/user-form.jsp	Sat Jan 23 14:47:59 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/user-form.jsp	Fri Apr 02 11:59:14 2021 +0200
@@ -28,10 +28,10 @@
 <%@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="viewmodel" type="de.uapcore.lightpit.viewmodel.UsersEditView" scope="request"/>
+<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.UserEditView" scope="request"/>
 <c:set var="user" scope="page" value="${viewmodel.user}" />
 
-<form action="./teams/commit" method="post">
+<form action="./users/-/commit" method="post">
     <table class="formtable">
         <colgroup>
             <col>
@@ -57,10 +57,19 @@
         </tr>
         </tbody>
         <tfoot>
+        <c:if test="${not empty viewmodel.errorText}">
+        <tr>
+            <td colspan="2">
+                <div class="error-box">
+                    <fmt:message key="${viewmodel.errorText}"/>
+                </div>
+            </td>
+        </tr>
+        </c:if>
         <tr>
             <td colspan="2">
                 <input type="hidden" name="userid" value="${user.id}"/>
-                <a href="./teams/" class="button">
+                <a href="./users/" class="button">
                     <fmt:message key="button.cancel"/>
                 </a>
                 <button type="submit"><fmt:message key="button.okay"/></button>