From 661db6c2948e4848b29645c66e17cbfcaa780ae0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 23 Jan 2013 07:52:20 -0500
Subject: [PATCH] Revised multiple owners contribution
---
src/com/gitblit/wicket/pages/EditRepositoryPage.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index 9a81bde..d68d655 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -61,7 +61,6 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
-import com.gitblit.utils.MultiConfigUtil;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.StringChoiceRenderer;
@@ -71,8 +70,6 @@
public class EditRepositoryPage extends RootSubPage {
- private MultiConfigUtil multiConfigUtil = new MultiConfigUtil();
-
private final boolean isCreate;
private boolean isAdmin;
@@ -97,7 +94,7 @@
// personal create permissions, inject personal repository path
model.name = user.getPersonalPath() + "/";
model.projectPath = user.getPersonalPath();
- model.addRepoAdministrator(user.username);
+ model.addOwner(user.username);
// personal repositories are private by default
model.accessRestriction = AccessRestrictionType.VIEW;
model.authorizationControl = AuthorizationControl.NAMED;
@@ -167,11 +164,11 @@
final RegistrantPermissionsPanel teamsPalette = new RegistrantPermissionsPanel("teams",
RegistrantType.TEAM, GitBlit.self().getAllTeamnames(), repositoryTeams, getAccessPermissions());
- // repo administrators palette
- List admins = multiConfigUtil.convertCollectionToList(repositoryModel.getRepoAdministrators());
- List persons = GitBlit.self().getAllUsernames();
- final Palette repoAdministratorsPalette = new Palette("repoAdministrators", new ListModel<String>(admins), new CollectionModel<String>(
- persons), new StringChoiceRenderer(), 10, true);
+ // owners palette
+ List<String> owners = new ArrayList<String>(repositoryModel.owners);
+ List<String> persons = GitBlit.self().getAllUsernames();
+ final Palette<String> ownersPalette = new Palette<String>("owners", new ListModel<String>(owners), new CollectionModel<String>(
+ persons), new StringChoiceRenderer(), 12, true);
// indexed local branches palette
List<String> allLocalBranches = new ArrayList<String>();
@@ -335,10 +332,11 @@
}
repositoryModel.indexedBranches = indexedBranches;
- repositoryModel.removeAllRepoAdministrators();
- Iterator<String> repoAdmins = repoAdministratorsPalette.getSelectedChoices();
- while (repoAdmins.hasNext()) {
- repositoryModel.addRepoAdministrator(repoAdmins.next());
+ // owners
+ repositoryModel.owners.clear();
+ Iterator<String> owners = ownersPalette.getSelectedChoices();
+ while (owners.hasNext()) {
+ repositoryModel.addOwner(owners.next());
}
// pre-receive scripts
@@ -392,7 +390,7 @@
// field names reflective match RepositoryModel fields
form.add(new TextField<String>("name").setEnabled(allowEditName));
form.add(new TextField<String>("description"));
- form.add(repoAdministratorsPalette);
+ form.add(ownersPalette);
form.add(new CheckBox("allowForks").setEnabled(GitBlit.getBoolean(Keys.web.allowForking, true)));
DropDownChoice<AccessRestrictionType> accessRestriction = new DropDownChoice<AccessRestrictionType>("accessRestriction", Arrays
.asList(AccessRestrictionType.values()), new AccessRestrictionRenderer());
@@ -573,9 +571,9 @@
isAdmin = true;
return;
} else {
- if (!model.isRepoAdministrator(user.username)) {
- // User is not an Admin nor RepoAdministrator
- error(getString("gb.errorOnlyAdminOrRepoAdminMayEditRepository"), true);
+ if (!model.isOwner(user.username)) {
+ // User is not an Admin nor Owner
+ error(getString("gb.errorOnlyAdminOrOwnerMayEditRepository"), true);
}
}
}
--
Gitblit v1.9.1