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/wicket/pages/EditTeamPage.java |   50 ++++++++++++++++++++++----------------------------
 1 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/com/gitblit/wicket/pages/EditTeamPage.java b/src/com/gitblit/wicket/pages/EditTeamPage.java
index 9cbccb5..8344d38 100644
--- a/src/com/gitblit/wicket/pages/EditTeamPage.java
+++ b/src/com/gitblit/wicket/pages/EditTeamPage.java
@@ -36,16 +36,18 @@
 import org.apache.wicket.model.util.CollectionModel;
 import org.apache.wicket.model.util.ListModel;
 
-import com.gitblit.Constants.AccessRestrictionType;
 import com.gitblit.GitBlit;
 import com.gitblit.GitBlitException;
-import com.gitblit.models.RepositoryModel;
+import com.gitblit.Keys;
+import com.gitblit.Constants.RegistrantType;
+import com.gitblit.models.RegistrantAccessPermission;
 import com.gitblit.models.TeamModel;
 import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.RequiresAdminRole;
 import com.gitblit.wicket.StringChoiceRenderer;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.BulletListPanel;
+import com.gitblit.wicket.panels.RegistrantPermissionsPanel;
 
 @RequiresAdminRole
 public class EditTeamPage extends RootSubPage {
@@ -59,6 +61,8 @@
 		super();
 		isCreate = true;
 		setupPage(new TeamModel(""));
+		setStatelessHint(false);
+		setOutputMarkupId(true);
 	}
 
 	public EditTeamPage(PageParameters params) {
@@ -68,6 +72,13 @@
 		String name = WicketUtils.getTeamname(params);
 		TeamModel model = GitBlit.self().getTeamModel(name);
 		setupPage(model);
+		setStatelessHint(false);
+		setOutputMarkupId(true);
+	}
+
+	@Override
+	protected boolean requiresPageMap() {
+		return true;
 	}
 
 	protected void setupPage(final TeamModel teamModel) {
@@ -79,14 +90,7 @@
 
 		CompoundPropertyModel<TeamModel> model = new CompoundPropertyModel<TeamModel>(teamModel);
 
-		List<String> repos = new ArrayList<String>();
-		for (String repo : GitBlit.self().getRepositoryList()) {
-			RepositoryModel repositoryModel = GitBlit.self().getRepositoryModel(repo);
-			if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {
-				repos.add(repo);
-			}
-		}
-		StringUtils.sortRepositorynames(repos);
+		List<String> repos = getAccessRestrictedRepositoryList(true, null);
 
 		List<String> teamUsers = new ArrayList<String>(teamModel.users);
 		Collections.sort(teamUsers);
@@ -94,11 +98,7 @@
 		List<String> postReceiveScripts = new ArrayList<String>();
 
 		final String oldName = teamModel.name;
-
-		// repositories palette
-		final Palette<String> repositories = new Palette<String>("repositories",
-				new ListModel<String>(new ArrayList<String>(teamModel.repositories)),
-				new CollectionModel<String>(repos), new StringChoiceRenderer(), 10, false);
+		final List<RegistrantAccessPermission> permissions = teamModel.getRepositoryPermissions();
 
 		// users palette
 		final Palette<String> users = new Palette<String>("users", new ListModel<String>(
@@ -146,17 +146,10 @@
 						return;
 					}
 				}
-				Iterator<String> selectedRepositories = repositories.getSelectedChoices();
-				List<String> repos = new ArrayList<String>();
-				while (selectedRepositories.hasNext()) {
-					repos.add(selectedRepositories.next().toLowerCase());
+				// update team permissions
+				for (RegistrantAccessPermission repositoryPermission : permissions) {
+					teamModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);
 				}
-				if (repos.size() == 0) {
-					error(getString("gb.teamMustSpecifyRepository"));
-					return;
-				}
-				teamModel.repositories.clear();
-				teamModel.repositories.addAll(repos);
 
 				Iterator<String> selectedUsers = users.getSelectedChoices();
 				List<String> members = new ArrayList<String>();
@@ -219,19 +212,20 @@
 		form.add(new SimpleAttributeModifier("autocomplete", "off"));
 
 		// not all user services support manipulating team memberships
-		boolean editMemberships = GitBlit.self().supportsTeamMembershipChanges();
+		boolean editMemberships = GitBlit.self().supportsTeamMembershipChanges(null);
 		
 		// field names reflective match TeamModel fields
 		form.add(new TextField<String>("name"));
 		form.add(new CheckBox("canAdmin"));
-		form.add(new CheckBox("canFork"));
+		form.add(new CheckBox("canFork").setEnabled(GitBlit.getBoolean(Keys.web.allowForking, true)));
 		form.add(new CheckBox("canCreate"));
 		form.add(users.setEnabled(editMemberships));
 		mailingLists = new Model<String>(teamModel.mailingLists == null ? ""
 				: StringUtils.flattenStrings(teamModel.mailingLists, " "));
 		form.add(new TextField<String>("mailingLists", mailingLists));
 
-		form.add(repositories);
+		form.add(new RegistrantPermissionsPanel("repositories", RegistrantType.REPOSITORY,
+				repos, permissions, getAccessPermissions()));
 		form.add(preReceivePalette);
 		form.add(new BulletListPanel("inheritedPreReceive", "inherited", GitBlit.self()
 				.getPreReceiveScriptsInherited(null)));

--
Gitblit v1.9.1