Teams must be sorted

diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 22f250cc1e86e6f45a0031d82b6d2e333398b56d..d7e8f57b040b60427b08f1c55f0390496d48e780 100644 (file)
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -24,6 +24,7 @@ import java.util.LinkedHashMap;
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.Set;\r
+import java.util.TreeSet;\r
 \r
 import com.gitblit.Constants.AccessPermission;\r
 import com.gitblit.Constants.AccessRestrictionType;\r
@@ -62,7 +63,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel>
        @Deprecated\r
        public final Set<String> repositories = new HashSet<String>();\r
        public final Map<String, AccessPermission> permissions = new LinkedHashMap<String, AccessPermission>();\r
-       public final Set<TeamModel> teams = new HashSet<TeamModel>();\r
+       public final Set<TeamModel> teams = new TreeSet<TeamModel>();\r
 \r
        // non-persisted fields\r
        public boolean isAuthenticated;\r

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index 60076177c82d36bb8d17c271412e3809877dcb33..e9b7d8f79b987653b9a18aa2124b80d5f80ece6b 100644 (file)
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -149,6 +149,7 @@ public class EditRepositoryPage extends RootSubPage {
                        repositoryUsers.addAll(GitBlit.self().getUserAccessPermissions(repositoryModel));\r
                        repositoryTeams.addAll(GitBlit.self().getTeamAccessPermissions(repositoryModel));\r
                        Collections.sort(repositoryUsers);\r
+                       Collections.sort(repositoryTeams);\r
                        \r
                        federationSets.addAll(repositoryModel.federationSets);\r
                        if (!ArrayUtils.isEmpty(repositoryModel.indexedBranches)) {\r