You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jm...@apache.org on 2006/09/14 08:06:00 UTC
svn commit: r443254 - in /maven/archiva/trunk/archiva-webapp/src/main:
java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java
resources/xwork.xml webapp/WEB-INF/jsp/decorators/default.jsp
Author: jmcconnell
Date: Wed Sep 13 23:05:59 2006
New Revision: 443254
URL: http://svn.apache.org/viewvc?view=rev&rev=443254
Log:
fixed up the user manglement page to work with the multiple entry points to it, as well as the granting of roles from the forms
Modified:
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java
maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Modified: maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java?view=diff&rev=443254&r1=443253&r2=443254
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/UserManagementAction.java Wed Sep 13 23:05:59 2006
@@ -73,26 +73,33 @@
public void prepare()
throws Exception
{
-
- if ( username != null )
+ if ( username == null || "".equals( username ) )
+ {
+ user = userManager.findUser( (String) session.get( "MANAGED_USERNAME" ) );
+ username = user.getUsername();
+ }
+ else
{
user = userManager.findUser( username );
+ }
- principal = user.getPrincipal().toString();
- fullName = user.getFullName();
- email = user.getEmail();
+ session.put( "MANAGED_USERNAME", username );
- if ( principal != null && rbacManager.userAssignmentExists( principal ) )
- {
- assignedRoles = new ArrayList( rbacManager.getAssignedRoles( principal ) );
- availableRoles = new ArrayList( rbacManager.getUnassignedRoles( principal ) );
- }
- else
- {
- assignedRoles = new ArrayList();
- availableRoles = rbacManager.getAllAssignableRoles();
- }
+ principal = user.getPrincipal().toString();
+ fullName = user.getFullName();
+ email = user.getEmail();
+
+ if ( principal != null && rbacManager.userAssignmentExists( principal ) )
+ {
+ assignedRoles = new ArrayList( rbacManager.getAssignedRoles( principal ) );
+ availableRoles = new ArrayList( rbacManager.getUnassignedRoles( principal ) );
}
+ else
+ {
+ assignedRoles = new ArrayList();
+ availableRoles = rbacManager.getAllAssignableRoles();
+ }
+
}
/**
@@ -100,13 +107,14 @@
*
* @return
*/
- public String input()
+ public String findUser()
{
try
{
if ( username != null )
{
user = userManager.findUser( username );
+ session.put( "MANAGED_USERNAME", username );
return SUCCESS;
}
else
Modified: maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml?view=diff&rev=443254&r1=443253&r2=443254
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml Wed Sep 13 23:05:59 2006
@@ -255,29 +255,29 @@
<action name="user" class="userManagement">
<result name="success">/WEB-INF/jsp/admin/user.jsp</result>
- <result name="input" type="chain">userManagement</result>
+ <result name="input" type="redirect-action">userManagement</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
<!-- plexus security actions -->
-
+ <!--
<action name="userDetails" class="userManagement" method="save">
<result name="input">/WEB-INF/jsp/admin/userDetails.jsp</result>
<result name="success" type="chain">user</result>
<interceptor-ref name="configuredPrepareParamsStack"/>
</action>
-
- <action name="userManagement" class="userManagement" method="input">
+ -->
+ <action name="userManagement" class="userManagement" method="findUser">
<result name="input">/WEB-INF/jsp/admin/findUser.jsp</result>
- <result name="success" type="chain">user</result>
+ <result name="success" type="redirect-action">user</result>
</action>
<action name="assignRoleToUser" class="plexusSecurityUserAssignment" method="assignRole">
- <result name="success" type="chain">user</result>
+ <result name="success" type="redirect-action">user</result>
</action>
<action name="removeRoleFromUser" class="plexusSecurityUserAssignment" method="removeRole">
- <result name="success" type="chain">user</result>
+ <result name="success" type="redirect-action">user</result>
</action>
</package>
Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?view=diff&rev=443254&r1=443253&r2=443254
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Wed Sep 13 23:05:59 2006
@@ -124,7 +124,7 @@
<pss:ifAnyAuthorized permissions="edit-configuration,edit-all-users">
<li class="expanded">
<pss:ifAuthorized permission="edit-all-users">
- <my:currentWWUrl action="userManagement" namespace="/admin">User Management</my:currentWWUrl>
+ <my:currentWWUrl action="userManagement!input" namespace="/admin">User Management</my:currentWWUrl>
</pss:ifAuthorized>
</li>
<li>