Update of 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory 
james.mmbase.org:/tmp/cvs-serv32235/community/src/webapp/editors/community

Modified Files:
      Tag: b1_4
        index.jsp user.jsp 
Log Message:
CMSC-842 Unable to edit a community user with 'special characters' in it's 
userId


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-842


Index: index.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/index.jsp,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- index.jsp   13 Mar 2008 08:41:19 -0000      1.4.2.2
+++ index.jsp   31 Mar 2008 13:02:28 -0000      1.4.2.3
@@ -86,9 +86,9 @@
          <c:forEach var="auth" items="${userList}">
             <pg:item>
             <tr>
-               <td style="padding-right: 10px"><a 
href="userAddInitAction.do?userid=${auth.userId}">${auth.userId}</a></td>
+               <td style="padding-right: 10px"><a 
href="userAddInitAction.do?authid=${auth.id}">${auth.userId}</a></td>
                <td>
-                  <a href="deleteUserAction.do?userid=${auth.userId}">
+                  <a href="deleteUserAction.do?authid=${auth.id}">
                      <img src="../gfx/icons/delete.png" border='0' 
title="<fmt:message key="view.removeuser" />"
                         onclick="return confirm('<fmt:message 
key="view.removeuserquestion" />')" />
                   </a>


Index: user.jsp
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/user.jsp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- user.jsp    25 Mar 2008 18:46:27 -0000      1.1.2.4
+++ user.jsp    31 Mar 2008 13:02:28 -0000      1.1.2.5
@@ -20,7 +20,7 @@
 
                <logic:equal name="communityUserForm" property="action" 
value="add">
                   <html:text property="account" size="30" />
-                  <span class="notvalid"><html:errors bundle="SECURITY" 
property="account" /></span>
+                  <span class="notvalid"><html:errors bundle="COMMUNITY" 
property="account" /></span>
                </logic:equal> 
                <logic:notEqual name="communityUserForm" property="action" 
value="add">
                   <bean:write name="communityUserForm" property="account" />
@@ -30,32 +30,40 @@
                        </tr>
          <tr>
             <td class="fieldname"><fmt:message key="view.firstname" /></td>
-            <td><html:text property="firstName" size='30' /></td>
+            <td><html:text property="firstName" size='30' />
+            <span class="notvalid"><html:errors bundle="COMMUNITY" 
property="firstName" /></span>
+            </td>
          </tr>
          <tr>
             <td class="fieldname"><fmt:message key="view.prefix" /></td>
-            <td><html:text property="prefix" size="15" /></td>
+            <td><html:text property="prefix" size="15" />
+            <span class="notvalid"><html:errors bundle="COMMUNITY" 
property="prefix" /></span>
+            </td>
          </tr>         
          <tr>
             <td class="fieldname"><fmt:message key="view.surname" /></td>
-            <td><html:text property="lastName" size='30' /></td>
+            <td><html:text property="lastName" size='30' />
+            <span class="notvalid"><html:errors bundle="COMMUNITY" 
property="lastName" /></span>
+            </td>
          </tr>
          <tr>
             <td class="fieldname"><fmt:message key="view.email" /></td>
-            <td><html:text property="email" size='30' /></td>
+            <td><html:text property="email" size='30' />
+            <span class="notvalid"><html:errors bundle="COMMUNITY" 
property="email" /></span>
+            </td>
          </tr>
          <tr>
             <td class="fieldname"><fmt:message key="view.password" /></td>
             <td>
                <html:password property="passwordText" size="15" maxlength="15" 
/>
-               <span class="notvalid"><html:errors bundle="SECURITY" 
property="passwordText" /></span>
+               <span class="notvalid"><html:errors bundle="COMMUNITY" 
property="passwordText" /></span>
             </td>
          </tr>
          <tr>
             <td class="fieldname" nowrap><fmt:message 
key="view.confirmpassword" /></td>
             <td>
                <html:password property="passwordConfirmation" size="15" 
maxlength="15" />
-               <span class="notvalid"><html:errors bundle="SECURITY" 
property="passwordConfirmation" /></span>
+               <span class="notvalid"><html:errors bundle="COMMUNITY" 
property="passwordConfirmation" /></span>
             </td>
          </tr>
            
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to