dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14461
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-03-27 02:36:23 +0100
message:
  minor fix
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java	2014-03-27 01:16:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java	2014-03-27 01:36:23 +0000
@@ -160,19 +160,19 @@
         this.properties = properties;
     }
 
-    private Map<AuthorityType, List<Authority>> authorityMap = Maps.newHashMap();
+    private Map<AuthorityType, List<String>> authorityMap = Maps.newHashMap();
 
-    public List<Authority> getAuthorityByType( AuthorityType type )
+    public List<String> getAuthorityByType( AuthorityType type )
     {
         if ( !authorityMap.containsKey( type ) )
         {
-            List<Authority> authorityList = Lists.newArrayList();
+            List<String> authorityList = Lists.newArrayList();
 
             for ( Authority authority : authorities )
             {
                 if ( type.equals( authority.getType() ) )
                 {
-                    authorityList.add( authority );
+                    authorityList.addAll( authority.getAuthorities() );
                 }
             }