You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/09/06 23:10:42 UTC
svn commit: r440872 -
/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java
Author: carlos
Date: Wed Sep 6 14:10:41 2006
New Revision: 440872
URL: http://svn.apache.org/viewvc?view=rev&rev=440872
Log:
[CONTINUUM-842] Fix permissions not being saved.
Modified:
maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java
Modified: maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java?view=diff&rev=440872&r1=440871&r2=440872
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/src/main/java/org/apache/maven/user/controller/action/EditUserAction.java Wed Sep 6 14:10:41 2006
@@ -84,7 +84,6 @@
public String execute()
throws Exception
{
- permissions = (List) request.getSession().getAttribute( "permissions" );
if ( username.indexOf( "," ) != -1 )
{
username = username.substring( 0, username.indexOf( "," ) );
@@ -99,14 +98,13 @@
}
if( !StringUtils.isEmpty( password ) && !password.equals( confirmPassword ) )
{
- addActionError( "user.password.mismatch.error" );
- return INPUT;
+ addActionError( "user.password.mismatch.error" );
+ return INPUT;
}
if ( addMode )
{
userGroup = new UserGroup();
userGroup.setName( username );
- userGroup.setPermissions( permissions );
user = new User();
user.setUsername( username );
@@ -115,16 +113,16 @@
user.setGroup( userGroup );
try
{
- userManager.addUser( user );
+ userManager.addUser( user );
}
catch ( PasswordRuleViolationException e )
{
- PasswordRuleViolations violationsContainer = e.getViolations();
- if( violationsContainer != null && violationsContainer.hasViolations() )
- {
- setActionErrors( violationsContainer.getLocalizedViolations() );
- return INPUT;
- }
+ PasswordRuleViolations violationsContainer = e.getViolations();
+ if( violationsContainer != null && violationsContainer.hasViolations() )
+ {
+ setActionErrors( violationsContainer.getLocalizedViolations() );
+ return INPUT;
+ }
}
}
else
@@ -133,6 +131,7 @@
user.setUsername( username );
user.setPassword( password );
user.setEmail( email );
+ permissions = (List) request.getSession().getAttribute( "permissions" );
user.getGroup().setPermissions( permissions );
try
{
@@ -140,12 +139,12 @@
}
catch ( PasswordRuleViolationException e )
{
- PasswordRuleViolations violationsContainer = e.getViolations();
- if( violationsContainer != null && violationsContainer.hasViolations() )
- {
- setActionErrors( violationsContainer.getLocalizedViolations() );
- return INPUT;
- }
+ PasswordRuleViolations violationsContainer = e.getViolations();
+ if( violationsContainer != null && violationsContainer.hasViolations() )
+ {
+ setActionErrors( violationsContainer.getLocalizedViolations() );
+ return INPUT;
+ }
}
}
@@ -334,13 +333,13 @@
this.password = password;
}
- public String getConfirmPassword() {
- return confirmPassword;
- }
-
- public void setConfirmPassword(String confirmPassword) {
- this.confirmPassword = confirmPassword;
- }
+ public String getConfirmPassword() {
+ return confirmPassword;
+ }
+
+ public void setConfirmPassword(String confirmPassword) {
+ this.confirmPassword = confirmPassword;
+ }
public String getEmail()
{