From: James Moger <james.moger@gitblit.com>
Date: Wed, 31 Oct 2012 20:37:19 +0000 (-0400)
Subject: Teams must be sorted
X-Git-Tag: v1.2.0~111
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=af6d95445106d3631b195ff51baebaffee541af3;p=gitblit.git

Teams must be sorted
---

diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 22f250cc..d7e8f57b 100644
--- 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;
 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 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel>
 	@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;
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index 60076177..e9b7d8f7 100644
--- 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));
 			repositoryTeams.addAll(GitBlit.self().getTeamAccessPermissions(repositoryModel));
 			Collections.sort(repositoryUsers);
+			Collections.sort(repositoryTeams);
 			
 			federationSets.addAll(repositoryModel.federationSets);
 			if (!ArrayUtils.isEmpty(repositoryModel.indexedBranches)) {