Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv15345/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
Tag: b1_4
GroupForm.java AbstractCommunityAction.java
GroupInitAction.java UserForm.java GroupAction.java
UserAddInitAction.java UserAddAction.java
Log Message:
CMSC-830 - Add Send Password functionality: major updates to Community and Form
validations.
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-830
Index: GroupForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/GroupForm.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
--- GroupForm.java 25 Feb 2008 16:26:17 -0000 1.1.2.1
+++ GroupForm.java 25 Mar 2008 18:46:27 -0000 1.1.2.2
@@ -19,6 +19,10 @@
*/
public class GroupForm extends ActionForm {
+ protected static final String ACTION_ADD = "add";
+
+ protected static final String ACTION_EDIT = "edit";
+
private static final long serialVersionUID = 1L;
private String action;
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.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- AbstractCommunityAction.java 25 Feb 2008 16:26:17 -0000 1.4.2.1
+++ AbstractCommunityAction.java 25 Mar 2008 18:46:27 -0000 1.4.2.2
@@ -28,10 +28,6 @@
*/
public class AbstractCommunityAction extends ActionSupport {
- protected static final String ACTION_ADD = "add";
-
- protected static final String ACTION_EDIT = "edit";
-
protected static final String SUCCESS = "success";
protected static final String CANCEL = "cancel";
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.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- GroupInitAction.java 25 Feb 2008 16:26:17 -0000 1.4.2.1
+++ GroupInitAction.java 25 Mar 2008 18:46:27 -0000 1.4.2.2
@@ -51,7 +51,7 @@
GroupForm groupForm = (GroupForm) actionForm;
if (id != null) {
- groupForm.setAction(ACTION_EDIT);
+ groupForm.setAction(GroupForm.ACTION_EDIT);
Authority auth = aus.findAuthorityByName(id);
if (auth != null) {
groupForm.setName(auth.getName());
@@ -71,7 +71,7 @@
}
} else {
// new
- groupForm.setAction(ACTION_ADD);
+ groupForm.setAction(GroupForm.ACTION_ADD);
groupForm.reset(actionMapping, request);
for (Iterator<Authentication> iter = users.iterator();
iter.hasNext();) {
Authentication user = iter.next();
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.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- UserForm.java 21 Mar 2008 16:46:29 -0000 1.2.2.2
+++ UserForm.java 25 Mar 2008 18:46:27 -0000 1.2.2.3
@@ -10,6 +10,7 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
@@ -20,6 +21,10 @@
*/
public class UserForm extends ActionForm {
+ protected static final String ACTION_ADD = "add";
+
+ protected static final String ACTION_EDIT = "edit";
+
private static final long serialVersionUID = 1L;
private String action;
@@ -114,19 +119,37 @@
public ActionErrors validate(ActionMapping actionMapping,
HttpServletRequest httpServletRequest) {
ActionErrors actionErrors = new ActionErrors();
+ if (account.equals("")) {
+ actionErrors.add("account", new
ActionMessage("userform.account.empty"));
+ }
if (email.equals("")) {
- actionErrors.add("email", new
ActionMessage("email.empty"));
+ actionErrors.add("email", new
ActionMessage("userform.email.empty"));
}
- if (passwordText.equals("")) {
- actionErrors.add("password", new
ActionMessage("password.empty"));
+ if (this.getAction().equalsIgnoreCase(ACTION_ADD)){
+ validatePassword(actionErrors);
+ } else {
+ if (this.getAction().equalsIgnoreCase(ACTION_EDIT)){
+ if (!StringUtils.isBlank(passwordText) ||
!StringUtils.isBlank(passwordConfirmation)){
+ validatePassword(actionErrors);
}
- if (passwordConfirmation.equals("")) {
- actionErrors.add("passwordConfirmation", new
ActionMessage("passwordConfirmation.empty"));
}
- if (!passwordText.equals("") &&
!passwordConfirmation.equals("") && !passwordText.equals(passwordConfirmation))
{
- actionErrors.add("password", new
ActionMessage("passwords.not_equal"));
}
return actionErrors;
}
+ public void validatePassword(ActionErrors actionErrors) {
+ //Only check this if an user is added
+ if (StringUtils.isBlank(passwordText)) {
+ actionErrors.add("password", new
ActionMessage("userform.password.empty"));
+ }
+ if (StringUtils.isBlank(passwordConfirmation)) {
+ actionErrors.add("passwordConfirmation", new
ActionMessage("userform.password.empty"));
+ }
+ if (!StringUtils.isBlank(passwordText)
+ && !StringUtils.isBlank(passwordConfirmation)
+ && !passwordText.equals(passwordConfirmation)) {
+ actionErrors.add("password", new
ActionMessage("userform.passwords.not_equal"));
+ }
+ }
+
}
Index: GroupAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/GroupAction.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- GroupAction.java 25 Feb 2008 16:26:17 -0000 1.3.2.1
+++ GroupAction.java 25 Mar 2008 18:46:27 -0000 1.3.2.2
@@ -7,8 +7,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -25,8 +23,6 @@
*/
public class GroupAction extends AbstractCommunityAction {
- private static Log log = LogFactory.getLog(GroupAction.class);
-
public ActionForward execute(ActionMapping actionMapping, ActionForm
actionForm, HttpServletRequest request,
HttpServletResponse httpServletResponse) throws
Exception {
@@ -64,7 +60,7 @@
// validate
ActionMessages errors = new ActionMessages();
- if (groupForm.getAction().equalsIgnoreCase(ACTION_ADD))
{
+ if
(groupForm.getAction().equalsIgnoreCase(GroupForm.ACTION_ADD)) {
if (id == null || id.length() < 3) {
errors.add("groupname", new
ActionMessage("error.groupname.invalid"));
saveErrors(request, errors);
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.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- UserAddInitAction.java 25 Mar 2008 14:55:48 -0000 1.3.2.3
+++ UserAddInitAction.java 25 Mar 2008 18:46:27 -0000 1.3.2.4
@@ -38,7 +38,7 @@
String id = request.getParameter(USERID);
UserForm userForm = (UserForm) actionForm;
if (id != null) {
- userForm.setAction(ACTION_EDIT);
+ userForm.setAction(UserForm.ACTION_EDIT);
AuthenticationService as = getAuthenticationService();
Authentication auth = as.findAuthentication(id);
@@ -63,7 +63,7 @@
} else {
// new
- userForm.setAction(ACTION_ADD);
+ userForm.setAction(UserForm.ACTION_ADD);
}
return actionMapping.findForward(SUCCESS);
Index: UserAddAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserAddAction.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- UserAddAction.java 25 Mar 2008 08:48:13 -0000 1.3.2.3
+++ UserAddAction.java 25 Mar 2008 18:46:27 -0000 1.3.2.4
@@ -11,6 +11,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionForm;
@@ -45,7 +46,7 @@
AuthenticationService as = getAuthenticationService();
PersonService ps = getPersonService();
- if (userForm.getAction().equalsIgnoreCase(ACTION_ADD)) {
+ if
(userForm.getAction().equalsIgnoreCase(UserForm.ACTION_ADD)) {
Long authenticationId =
as.getAuthenticationIdForUserId(accountName);
if (authenticationId == null) {
Authentication authentication =
as.createAuthentication(userForm.getEmail(), userForm.getPasswordText());
@@ -62,28 +63,23 @@
log.info("add check1 failed for: " +
accountName);
}
- } else if
(userForm.getAction().equalsIgnoreCase(ACTION_EDIT)) {
+ } else if
(userForm.getAction().equalsIgnoreCase(UserForm.ACTION_EDIT)) {
Long authenticationId =
as.getAuthenticationIdForUserId(accountName);
if (authenticationId != null) {
String newPassword1 =
userForm.getPasswordText();
String newPassword2 =
userForm.getPasswordConfirmation();
- if (newPassword1 != null &&
newPassword2 != null) {
+ if (!StringUtils.isBlank(newPassword1)
&& !StringUtils.isBlank(newPassword2)) {
if
(newPassword1.equals(newPassword2)) {
as.updateAuthenticationPassword(accountName, newPassword1);
}
}
//First retrieve the right person
object from the database
- Person p = new Person();
- p.setAuthenticationId(authenticationId);
- Person person = null;
+ Person person = ps.getPersonByAuthentication(authenticationId);
- if (ps.getPerson(p).isEmpty()) { //User did not exists, so
create it.
+ if (person == null) { //User did not exists, so create it.
person = new Person();
person.setAuthenticationId(authenticationId);
- } else {
- //Update existing Person from database.
- person = ps.getPerson(p).get(0); //Retrieve first user found
}
//Also save other fields entered in the form to the right
person object
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
