Teams must be sorted

James Moger

2012-10-31 af6d95445106d3631b195ff51baebaffee541af3

Teams must be sorted

 src/com/gitblit/models/UserModel.java

@@ -24,6 +24,7 @@
import java.util.List;

import java.util.Map;

import java.util.Set;

import java.util.TreeSet;



import com.gitblit.Constants.AccessPermission;

import com.gitblit.Constants.AccessRestrictionType;

@@ -62,7 +63,7 @@
    @Deprecated

    public final Set<String> repositories = new HashSet<String>();

    public final Map<String, AccessPermission> permissions = new LinkedHashMap<String, AccessPermission>();

    public final Set<TeamModel> teams = new HashSet<TeamModel>();

    public final Set<TeamModel> teams = new TreeSet<TeamModel>();



    // non-persisted fields

    public boolean isAuthenticated;


 src/com/gitblit/wicket/pages/EditRepositoryPage.java

@@ -149,6 +149,7 @@
            repositoryUsers.addAll(GitBlit.self().getUserAccessPermissions(repositoryModel));

            repositoryTeams.addAll(GitBlit.self().getTeamAccessPermissions(repositoryModel));

            Collections.sort(repositoryUsers);

            Collections.sort(repositoryTeams);

            

            federationSets.addAll(repositoryModel.federationSets);

            if (!ArrayUtils.isEmpty(repositoryModel.indexedBranches)) {