From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master

---
 src/com/gitblit/client/EditTeamDialog.java |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/com/gitblit/client/EditTeamDialog.java b/src/com/gitblit/client/EditTeamDialog.java
index 4eb0729..4d7af26 100644
--- a/src/com/gitblit/client/EditTeamDialog.java
+++ b/src/com/gitblit/client/EditTeamDialog.java
@@ -45,6 +45,8 @@
 import javax.swing.KeyStroke;
 
 import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.Constants.AuthorizationControl;
+import com.gitblit.Constants.RegistrantType;
 import com.gitblit.models.RegistrantAccessPermission;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.ServerSettings;
@@ -139,7 +141,7 @@
 		fieldsPanel.add(newFieldPanel(Translation.get("gb.mailingLists"), mailingListsField));
 
 		final Insets _insets = new Insets(5, 5, 5, 5);
-		repositoryPalette = new RegistrantPermissionsPanel();
+		repositoryPalette = new RegistrantPermissionsPanel(RegistrantType.REPOSITORY);
 		userPalette = new JPalette<String>();
 		userPalette.setEnabled(settings.supportsTeamMembershipChanges);
 		
@@ -310,18 +312,40 @@
 	public void setRepositories(List<RepositoryModel> repositories, List<RegistrantAccessPermission> permissions) {
 		List<String> restricted = new ArrayList<String>();
 		for (RepositoryModel repo : repositories) {
-			if (repo.accessRestriction.exceeds(AccessRestrictionType.NONE)) {
+			if (repo.accessRestriction.exceeds(AccessRestrictionType.NONE)
+					&& repo.authorizationControl.equals(AuthorizationControl.NAMED)) {
 				restricted.add(repo.name);
+			}				
+		}
+		StringUtils.sortRepositorynames(restricted);
+		
+		List<String> list = new ArrayList<String>();
+		// repositories
+		list.add(".*");
+		// all repositories excluding personal repositories
+		list.add("[^~].*");
+		String lastProject = null;
+		for (String repo : restricted) {
+			String projectPath = StringUtils.getFirstPathElement(repo);
+			if (lastProject == null || !lastProject.equalsIgnoreCase(projectPath)) {
+				lastProject = projectPath;
+				if (!StringUtils.isEmpty(projectPath)) {
+					// regex for all repositories within a project
+					list.add(projectPath + "/.*");
+				}
+				list.add(repo);
 			}
 		}
-		
-		// remove repositories for which team already has a permission
-		for (RegistrantAccessPermission rp : permissions) {
-			restricted.remove(rp.registrant);
-		}
 
-		StringUtils.sortRepositorynames(restricted);
-		repositoryPalette.setObjects(restricted, permissions);
+		// remove repositories for which user already has a permission
+		if (permissions == null) {
+			permissions = new ArrayList<RegistrantAccessPermission>();
+		} else {
+			for (RegistrantAccessPermission rp : permissions) {
+				list.remove(rp.registrant);
+			}
+		}
+		repositoryPalette.setObjects(list, permissions);
 	}
 
 	public void setUsers(List<String> users, List<String> selected) {

--
Gitblit v1.9.1