svn commit: r443410 - in /maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user: edit.jsp list.jsp userForm.jsp

[ca...@apache.org]

Author: carlos
Date: Thu Sep 14 10:07:07 2006
New Revision: 443410

URL: http://svn.apache.org/viewvc?view=rev&rev=443410
Log:
Use ids and add locked and full name edit fields

Modified:
    maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/edit.jsp
    maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/list.jsp
    maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/userForm.jsp

Modified: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/edit.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/edit.jsp?view=diff&rev=443410&r1=443409&r2=443410
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/edit.jsp (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/edit.jsp Thu Sep 14 10:07:07 2006
@@ -5,24 +5,27 @@
 <script>
   function getData() {
     var addMode_field = document.getElementById('addMode_field');
-    var accountId_field = document.getElementById('accountId_field');
+    var id_field = document.getElementById('id_field');
     var username_field = document.getElementById('username_field');
     var password_field = document.getElementById('password_field');
     var confirm_password_field = document.getElementById('confirm_password_field');
+    var locked_field = document.getElementById('locked_field');
     var email_field = document.getElementById('email_field');
 
     var addMode = document.getElementById('addMode');
-    var accountId = document.getElementById('accountId');
+    var id = document.getElementById('id');
     var username = document.getElementById('username');
     var password = document.getElementById('password');
     var confirmPassword = document.getElementById('confirmPassword');
+    var locked = document.getElementById('locked');
     var email = document.getElementById('email');
 
     addMode.value = addMode_field.value;
-    accountId.value = accountId_field.value;
+    id.value = id_field.value;
     username.value = username_field.value;
     password.value = password_field.value;
     confirmPassword.value = confirm_password_field.value;
+    locked.value = locked_field.value;
     email.value = email_field.value;
   }
 </script>

Modified: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/list.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/list.jsp?view=diff&rev=443410&r1=443409&r2=443410
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/list.jsp (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/list.jsp Thu Sep 14 10:07:07 2006
@@ -22,15 +22,13 @@
             <ec:column property="actions" title="&nbsp;">
 
               <c:url var="editUrl" value="/user/edit!doEdit.action">
-                <c:param name="accountId" value="${user.accountId}"/>
-                <c:param name="username" value="${user.username}"/>
+                <c:param name="id" value="${user.accountId}"/>
               </c:url>
 
               <a href="<c:out value='${editUrl}'/>"><ww:text name="edit"/></a>
 
               <c:url var="deleteUrl" value="/user/delete!doDelete.action">
-                <c:param name="accountId" value="${user.accountId}"/>
-                <c:param name="username" value="${user.username}"/>
+                <c:param name="id" value="${user.accountId}"/>
               </c:url>
 
               <a href="<c:out value='${deleteUrl}'/>"><ww:text name="delete"/></a>

Modified: maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/userForm.jsp
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/userForm.jsp?view=diff&rev=443410&r1=443409&r2=443410
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/userForm.jsp (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/src/main/webapp/user/userForm.jsp Thu Sep 14 10:07:07 2006
@@ -15,7 +15,7 @@
     <tbody>
       <ww:hidden id="addMode" name="addMode"/>
       <ww:hidden id="addMode_field" name="addMode"/>
-      <ww:hidden id="accountId_field" name="accountId"/>
+      <ww:hidden id="id_field" name="id"/>
       <ww:if test="addMode == true">
         <ww:textfield id="username_field" label="%{getText('user.username')}" name="username" required="true"/>
       </ww:if>
@@ -23,6 +23,7 @@
         <ww:hidden id="username_field" name="username"/>
         <ww:label label="%{getText('user.username')}" name="username" required="true"/>
       </ww:else>
+      <ww:textfield id="fullName_field" label="%{getText('user.fullname')}" name="fullName"/>
       <ww:password id="password_field" label="%{getText('user.password')}" name="password" required="true"/>
       <ww:password id="confirm_password_field" label="%{getText('user.confirm.password')}" name="confirmPassword" required="true"/>
       <ww:textfield id="email_field" label="%{getText('user.email')}" name="email" required="true"/>
@@ -39,6 +40,9 @@
                          required="true"/>
         </authz:authorize>
       </ww:if>
+      <authz:authorize ifAnyGranted="ROLE_admin,ROLE_manageUsers">
+        <ww:checkbox id="locked_field" label="Locked" name="locked"/>
+      </authz:authorize>
     </tbody>
   </table>
   <div class="functnbar3">