You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@archiva.apache.org by ol...@apache.org on 2013/11/28 04:03:53 UTC

svn commit: r1546261 - /archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java

Author: olamy
Date: Thu Nov 28 03:03:52 2013
New Revision: 1546261

URL: http://svn.apache.org/r1546261
Log:
[MRM-1764] #users > edit roles -- please sort repository list for ease of use

Modified:
    archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java?rev=1546261&r1=1546260&r2=1546261&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java Thu Nov 28 03:03:52 2013
@@ -631,7 +631,11 @@ public class DefaultRoleManagementServic
                 Collection<org.apache.archiva.redback.rbac.Role> appRoles =
                     filterApplicationRoles( modelApplication, allRoles, modelApplication.getTemplates() );
 
-                applicationRoles.setGlobalRoles( toRoleNames( appRoles ) );
+                List<String> roleNames = new ArrayList<String>( toRoleNames( appRoles ) );
+
+                Collections.sort( roleNames );
+
+                applicationRoles.setGlobalRoles( roleNames );
 
                 Set<String> resources = discoverResources( modelApplication.getTemplates(), appRoles );
 
@@ -651,8 +655,12 @@ public class DefaultRoleManagementServic
                     }
                 }
 
+                Collections.sort( appRoleNames );
+
                 applicationRoles.setGlobalRoles( appRoleNames );
 
+                Collections.sort( appRoleNames );
+
                 applicationRolesList.add( applicationRoles );
             }