Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv32235/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
Tag: b1_4
UserAddInitAction.java AbstractCommunityAction.java
UserForm.java DeleteUserAction.java DeleteGroupAction.java
GroupInitAction.java
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/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-842
Index: UserAddInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserAddInitAction.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -b -r1.3.2.4 -r1.3.2.5
--- UserAddInitAction.java 25 Mar 2008 18:46:27 -0000 1.3.2.4
+++ UserAddInitAction.java 31 Mar 2008 13:02:28 -0000 1.3.2.5
@@ -30,37 +30,38 @@
public class UserAddInitAction extends AbstractCommunityAction {
private static Log log = LogFactory.getLog(UserAddInitAction.class);
+ protected static final String AUTHENTICATION_ID = "authid";
+
public ActionForward execute(ActionMapping actionMapping, ActionForm
actionForm, HttpServletRequest request,
HttpServletResponse httpServletResponse) throws
Exception {
-// AuthorityService aus = getAuthorityService();
-
- String id = request.getParameter(USERID);
+ String authId = request.getParameter(AUTHENTICATION_ID);
UserForm userForm = (UserForm) actionForm;
- if (id != null) {
- userForm.setAction(UserForm.ACTION_EDIT);
+ userForm.clear();
+
+ Authentication auth = null;
AuthenticationService as = getAuthenticationService();
- Authentication auth = as.findAuthentication(id);
+ if (authId != null) {
+ auth = as.getAuthenticationById(Long.valueOf(authId));
+ }
+
if (auth != null) {
+ userForm.setAction(UserForm.ACTION_EDIT);
+ userForm.setAccount(auth.getUserId());
+
PersonService ps = getPersonService();
- Person person = ps.getPersonByUserId(id);
//Returns null when no Person object was found!
- userForm.setAccount(id);
+ //Returns null when no Person object was found!
+ Person person = ps.getPersonByAuthenticationId(auth.getId());
if (person != null) {
userForm.setFirstName(person.getFirstName());
userForm.setPrefix(person.getInfix());
userForm.setLastName(person.getLastName());
userForm.setEmail(person.getEmail());
-
- } else {
- log.info("person failed");
- }
-
} else {
- log.info("auth failed");
+ log.debug("person failed");
}
-
} else {
// new
userForm.setAction(UserForm.ACTION_ADD);
Index: AbstractCommunityAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/AbstractCommunityAction.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- AbstractCommunityAction.java 25 Mar 2008 18:46:27 -0000 1.4.2.2
+++ AbstractCommunityAction.java 31 Mar 2008 13:02:28 -0000 1.4.2.3
@@ -32,10 +32,6 @@
protected static final String CANCEL = "cancel";
- protected static final String USERID = "userid";
-
- protected static final String GROUPID = "groupid";
-
protected AuthenticationService getAuthenticationService() {
WebApplicationContext ctx = getWebApplicationContext();
return (AuthenticationService)
ctx.getBean("authenticationService");
Index: UserForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserForm.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- UserForm.java 25 Mar 2008 18:46:27 -0000 1.2.2.3
+++ UserForm.java 31 Mar 2008 13:02:28 -0000 1.2.2.4
@@ -152,4 +152,16 @@
}
}
+ public void clear() {
+ action = null;
+ email = null;
+ passwordText = null;
+ passwordConfirmation = null;
+ account = null;
+ firstName = null;
+ prefix = null;
+ lastName = null;
+ company = null;
+ }
+
}
Index: DeleteUserAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/DeleteUserAction.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- DeleteUserAction.java 31 Jan 2008 13:48:20 -0000 1.3
+++ DeleteUserAction.java 31 Mar 2008 13:02:28 -0000 1.3.2.1
@@ -3,6 +3,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -14,13 +15,16 @@
*/
public class DeleteUserAction extends AbstractCommunityAction {
+ protected static final String AUTHENTICATION_ID = "authid";
+
@Override
public ActionForward execute(ActionMapping mapping, ActionForm
actionForm, HttpServletRequest request,
HttpServletResponse httpServletResponse) throws
Exception {
- String userId = request.getParameter(USERID);
- if (userId != null) {
- getPersonService().deletePersonByUserId(userId);
- getAuthenticationService().deleteAuthentication(userId);
+ String authenticationId =
request.getParameter(AUTHENTICATION_ID);
+ if (!StringUtils.isBlank(authenticationId)) {
+ Long authId = Long.valueOf(authenticationId);
+ getPersonService().deletePersonByAuthenticationId(authId);
+ getAuthenticationService().deleteAuthentication(authId);
}
return mapping.findForward(SUCCESS);
}
Index: DeleteGroupAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/DeleteGroupAction.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- DeleteGroupAction.java 25 Feb 2008 16:26:17 -0000 1.1.2.1
+++ DeleteGroupAction.java 31 Mar 2008 13:02:28 -0000 1.1.2.2
@@ -23,6 +23,8 @@
*/
public class DeleteGroupAction extends AbstractCommunityAction {
+ protected static final String GROUPID = "groupid";
+
public ActionForward execute(ActionMapping actionMapping, ActionForm
actionForm, HttpServletRequest request,
HttpServletResponse httpServletResponse) throws
Exception {
String groupId = request.getParameter(GROUPID);
Index: GroupInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/GroupInitAction.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- GroupInitAction.java 25 Mar 2008 18:46:27 -0000 1.4.2.2
+++ GroupInitAction.java 31 Mar 2008 13:02:28 -0000 1.4.2.3
@@ -36,6 +36,8 @@
private static Log log = LogFactory.getLog(GroupInitAction.class);
+ protected static final String GROUPID = "groupid";
+
public ActionForward execute(ActionMapping actionMapping, ActionForm
actionForm, HttpServletRequest request,
HttpServletResponse httpServletResponse) throws
Exception {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
