← Back to branch summary

~dhis2-devs-core/dhis2/ebola

« back to all changes in this revision

Viewing changes to dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserAction.java

  • Committer: Abyot Asalefew Gizaw
  • Date: 2015-01-02 14:39:01 UTC
  • mfrom: (16797.1.1036 dhis2)
  • Revision ID: abyota@gmail.com-20150102143901-hm8dy7j83t8rfadl
merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserAction.java
29
29
 */
30
30
 
31
31
import java.util.ArrayList;
32
 
import java.util.Collection;
 
32
import java.util.Collections;
 
33
import java.util.List;
33
34
 
34
35
import org.hisp.dhis.user.User;
35
36
import org.hisp.dhis.user.UserAuthorityGroup;
73
74
        return user;
74
75
    }
75
76
 
76
 
    private Collection<UserAuthorityGroup> userAuthorityGroups;
 
77
    private List<UserAuthorityGroup> userAuthorityGroups;
77
78
 
78
 
    public Collection<UserAuthorityGroup> getUserAuthorityGroups()
 
79
    public List<UserAuthorityGroup> getUserAuthorityGroups()
79
80
    {
80
81
        return userAuthorityGroups;
81
82
    }
97
98
            userAuthorityGroups.removeAll( user.getUserCredentials().getUserAuthorityGroups() );
98
99
        }
99
100
        
 
101
        Collections.sort( userAuthorityGroups );
 
102
        
100
103
        return SUCCESS;
101
104
    }
102
105
}