From 73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 27 Nov 2012 17:13:03 -0500
Subject: [PATCH] Added short commit id column to log and history tables (issue 168)

---
 src/com/gitblit/wicket/pages/EditRepositoryPage.java |  371 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 306 insertions(+), 65 deletions(-)

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index 1eae2c9..dead34a 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -21,30 +21,43 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.apache.wicket.PageParameters;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.behavior.SimpleAttributeModifier;
 import org.apache.wicket.extensions.markup.html.form.palette.Palette;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.RadioChoice;
 import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.util.CollectionModel;
 import org.apache.wicket.model.util.ListModel;
 
+import com.gitblit.Constants;
 import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.Constants.AuthorizationControl;
 import com.gitblit.Constants.FederationStrategy;
+import com.gitblit.Constants.RegistrantType;
 import com.gitblit.GitBlit;
 import com.gitblit.GitBlitException;
 import com.gitblit.Keys;
+import com.gitblit.models.RegistrantAccessPermission;
 import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.UserModel;
 import com.gitblit.utils.ArrayUtils;
@@ -53,12 +66,15 @@
 import com.gitblit.wicket.StringChoiceRenderer;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.BulletListPanel;
+import com.gitblit.wicket.panels.RegistrantPermissionsPanel;
 
 public class EditRepositoryPage extends RootSubPage {
 
 	private final boolean isCreate;
 
 	private boolean isAdmin;
+	
+	RepositoryModel repositoryModel;
 
 	private IModel<String> mailingLists;
 
@@ -66,7 +82,27 @@
 		// create constructor
 		super();
 		isCreate = true;
-		setupPage(new RepositoryModel());
+		RepositoryModel model = new RepositoryModel();
+		String restriction = GitBlit.getString(Keys.git.defaultAccessRestriction, null);
+		model.accessRestriction = AccessRestrictionType.fromName(restriction);
+		String authorization = GitBlit.getString(Keys.git.defaultAuthorizationControl, null);
+		model.authorizationControl = AuthorizationControl.fromName(authorization);
+		
+		GitBlitWebSession session = GitBlitWebSession.get();
+		UserModel user = session.getUser();
+		if (user != null && user.canCreate() && !user.canAdmin()) {
+			// personal create permissions, inject personal repository path
+			model.name = user.getPersonalPath() + "/";
+			model.projectPath = user.getPersonalPath();
+			model.owner = user.username;
+			// personal repositories are private by default
+			model.accessRestriction = AccessRestrictionType.VIEW;
+			model.authorizationControl = AuthorizationControl.NAMED;
+		}
+		
+		setupPage(model);
+		setStatelessHint(false);
+		setOutputMarkupId(true);
 	}
 
 	public EditRepositoryPage(PageParameters params) {
@@ -76,46 +112,73 @@
 		String name = WicketUtils.getRepositoryName(params);
 		RepositoryModel model = GitBlit.self().getRepositoryModel(name);
 		setupPage(model);
+		setStatelessHint(false);
+		setOutputMarkupId(true);
+	}
+	
+	@Override
+	protected boolean requiresPageMap() {
+		return true;
 	}
 
-	protected void setupPage(final RepositoryModel repositoryModel) {
+	protected void setupPage(RepositoryModel model) {
+		this.repositoryModel = model;
+		
 		// ensure this user can create or edit this repository
 		checkPermissions(repositoryModel);
 
+		List<String> indexedBranches = new ArrayList<String>();
 		List<String> federationSets = new ArrayList<String>();
-		List<String> repositoryUsers = new ArrayList<String>();
-		List<String> repositoryTeams = new ArrayList<String>();
+		final List<RegistrantAccessPermission> repositoryUsers = new ArrayList<RegistrantAccessPermission>();
+		final List<RegistrantAccessPermission> repositoryTeams = new ArrayList<RegistrantAccessPermission>();
 		List<String> preReceiveScripts = new ArrayList<String>();
 		List<String> postReceiveScripts = new ArrayList<String>();
 
+		GitBlitWebSession session = GitBlitWebSession.get();
+		final UserModel user = session.getUser() == null ? UserModel.ANONYMOUS : session.getUser();
+		final boolean allowEditName = isCreate || isAdmin || repositoryModel.isUsersPersonalRepository(user.username);
+		
 		if (isCreate) {
-			super.setupPage(getString("gb.newRepository"), "");
+			if (user.canAdmin()) {
+				super.setupPage(getString("gb.newRepository"), "");
+			} else {
+				super.setupPage(getString("gb.newRepository"), user.getDisplayName());
+			}
 		} else {
 			super.setupPage(getString("gb.edit"), repositoryModel.name);
-			if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {
-				repositoryUsers.addAll(GitBlit.self().getRepositoryUsers(repositoryModel));
-				repositoryTeams.addAll(GitBlit.self().getRepositoryTeams(repositoryModel));
-				Collections.sort(repositoryUsers);
-			}
+			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)) {
+				indexedBranches.addAll(repositoryModel.indexedBranches);
+			}
 		}
 
 		final String oldName = repositoryModel.name;
-		// users palette
-		final Palette<String> usersPalette = new Palette<String>("users", new ListModel<String>(
-				repositoryUsers), new CollectionModel<String>(GitBlit.self().getAllUsernames()),
-				new StringChoiceRenderer(), 10, false);
 
-		// teams palette
-		final Palette<String> teamsPalette = new Palette<String>("teams", new ListModel<String>(
-				repositoryTeams), new CollectionModel<String>(GitBlit.self().getAllTeamnames()),
-				new StringChoiceRenderer(), 5, false);
+		final RegistrantPermissionsPanel usersPalette = new RegistrantPermissionsPanel("users", 
+				RegistrantType.USER, GitBlit.self().getAllUsernames(), repositoryUsers, getAccessPermissions());
+		final RegistrantPermissionsPanel teamsPalette = new RegistrantPermissionsPanel("teams", 
+				RegistrantType.TEAM, GitBlit.self().getAllTeamnames(), repositoryTeams, getAccessPermissions());
 
+		// indexed local branches palette
+		List<String> allLocalBranches = new ArrayList<String>();
+		allLocalBranches.add(Constants.DEFAULT_BRANCH);
+		allLocalBranches.addAll(repositoryModel.getLocalBranches());
+		boolean luceneEnabled = GitBlit.getBoolean(Keys.web.allowLuceneIndexing, true);
+		final Palette<String> indexedBranchesPalette = new Palette<String>("indexedBranches", new ListModel<String>(
+				indexedBranches), new CollectionModel<String>(allLocalBranches),
+				new StringChoiceRenderer(), 8, false);
+		indexedBranchesPalette.setEnabled(luceneEnabled);
+		
 		// federation sets palette
 		List<String> sets = GitBlit.getStrings(Keys.federation.sets);
 		final Palette<String> federationSetsPalette = new Palette<String>("federationSets",
 				new ListModel<String>(federationSets), new CollectionModel<String>(sets),
-				new StringChoiceRenderer(), 5, false);
+				new StringChoiceRenderer(), 8, false);
 
 		// pre-receive palette
 		if (!ArrayUtils.isEmpty(repositoryModel.preReceiveScripts)) {
@@ -134,10 +197,32 @@
 				new ListModel<String>(postReceiveScripts), new CollectionModel<String>(GitBlit
 						.self().getPostReceiveScriptsUnused(repositoryModel)),
 				new StringChoiceRenderer(), 12, true);
+		
+		// custom fields
+		final Map<String, String> customFieldsMap = GitBlit.getMap(Keys.groovy.customFields);
+		List<String> customKeys = new ArrayList<String>(customFieldsMap.keySet());
+		final ListView<String> customFieldsListView = new ListView<String>("customFieldsListView", customKeys) {
+			
+			private static final long serialVersionUID = 1L;
 
-		CompoundPropertyModel<RepositoryModel> model = new CompoundPropertyModel<RepositoryModel>(
+			@Override
+			protected void populateItem(ListItem<String> item) {
+				String key = item.getModelObject();
+				item.add(new Label("customFieldLabel", customFieldsMap.get(key)));
+				
+				String value = "";
+				if (repositoryModel.customFields != null && repositoryModel.customFields.containsKey(key)) {
+					value = repositoryModel.customFields.get(key);
+				}
+				TextField<String> field = new TextField<String>("customFieldValue", new Model<String>(value));
+				item.add(field);
+			}
+		};
+		customFieldsListView.setReuseItems(true);
+
+		CompoundPropertyModel<RepositoryModel> rModel = new CompoundPropertyModel<RepositoryModel>(
 				repositoryModel);
-		Form<RepositoryModel> form = new Form<RepositoryModel>("editForm", model) {
+		Form<RepositoryModel> form = new Form<RepositoryModel>("editForm", rModel) {
 
 			private static final long serialVersionUID = 1L;
 
@@ -145,11 +230,14 @@
 			protected void onSubmit() {
 				try {
 					// confirm a repository name was entered
-					if (StringUtils.isEmpty(repositoryModel.name)) {
-						error("Please set repository name!");
+					if (repositoryModel.name == null && StringUtils.isEmpty(repositoryModel.name)) {
+						error(getString("gb.pleaseSetRepositoryName"));
 						return;
 					}
-
+					
+					// ensure name is trimmed
+					repositoryModel.name = repositoryModel.name.trim();
+					
 					// automatically convert backslashes to forward slashes
 					repositoryModel.name = repositoryModel.name.replace('\\', '/');
 					// Automatically replace // with /
@@ -157,35 +245,54 @@
 
 					// prohibit folder paths
 					if (repositoryModel.name.startsWith("/")) {
-						error("Leading root folder references (/) are prohibited.");
+						error(getString("gb.illegalLeadingSlash"));
 						return;
 					}
 					if (repositoryModel.name.startsWith("../")) {
-						error("Relative folder references (../) are prohibited.");
+						error(getString("gb.illegalRelativeSlash"));
 						return;
 					}
 					if (repositoryModel.name.contains("/../")) {
-						error("Relative folder references (../) are prohibited.");
+						error(getString("gb.illegalRelativeSlash"));
 						return;
+					}					
+					if (repositoryModel.name.endsWith("/")) {
+						repositoryModel.name = repositoryModel.name.substring(0, repositoryModel.name.length() - 1);
 					}
 
 					// confirm valid characters in repository name
 					Character c = StringUtils.findInvalidCharacter(repositoryModel.name);
 					if (c != null) {
-						error(MessageFormat.format("Illegal character ''{0}'' in repository name!",
+						error(MessageFormat.format(getString("gb.illegalCharacterRepositoryName"),
 								c));
 						return;
+					}
+					
+					if (user.canCreate() && !user.canAdmin() && allowEditName) {
+						// ensure repository name begins with the user's path
+						if (!repositoryModel.name.startsWith(user.getPersonalPath())) {
+							error(MessageFormat.format(getString("gb.illegalPersonalRepositoryLocation"),
+									user.getPersonalPath()));
+							return;
+						}
+						
+						if (repositoryModel.name.equals(user.getPersonalPath())) {
+							// reset path prefix and show error
+							repositoryModel.name = user.getPersonalPath() + "/";
+							error(getString("gb.pleaseSetRepositoryName"));
+							return;
+						}
 					}
 
 					// confirm access restriction selection
 					if (repositoryModel.accessRestriction == null) {
-						error("Please select access restriction!");
+						error(getString("gb.selectAccessRestriction"));
 						return;
 					}
 
 					// confirm federation strategy selection
 					if (repositoryModel.federationStrategy == null) {
-						error("Please select federation strategy!");
+						error(getString("gb.selectFederationStrategy"));
 						return;
 					}
 
@@ -211,6 +318,14 @@
 						repositoryModel.mailingLists = new ArrayList<String>(list);
 					}
 
+					// indexed branches
+					List<String> indexedBranches = new ArrayList<String>();
+					Iterator<String> branches = indexedBranchesPalette.getSelectedChoices();
+					while (branches.hasNext()) {
+						indexedBranches.add(branches.next());
+					}
+					repositoryModel.indexedBranches = indexedBranches;
+
 					// pre-receive scripts
 					List<String> preReceiveScripts = new ArrayList<String>();
 					Iterator<String> pres = preReceivePalette.getSelectedChoices();
@@ -226,32 +341,26 @@
 						postReceiveScripts.add(post.next());
 					}
 					repositoryModel.postReceiveScripts = postReceiveScripts;
+					
+					// custom fields
+					repositoryModel.customFields = new LinkedHashMap<String, String>();
+					for (int i = 0; i < customFieldsListView.size(); i++) {
+						ListItem<String> child = (ListItem<String>) customFieldsListView.get(i);
+						String key = child.getModelObject();
 
+						TextField<String> field = (TextField<String>) child.get("customFieldValue");
+						String value = field.getValue();
+						
+						repositoryModel.customFields.put(key, value);
+					}
+					
 					// save the repository
 					GitBlit.self().updateRepositoryModel(oldName, repositoryModel, isCreate);
 
-					// repository access
+					// repository access permissions
 					if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {
-						// save the user access list
-						Iterator<String> users = usersPalette.getSelectedChoices();
-						List<String> repositoryUsers = new ArrayList<String>();
-						while (users.hasNext()) {
-							repositoryUsers.add(users.next());
-						}
-						// ensure the owner is added to the user list
-						if (repositoryModel.owner != null
-								&& !repositoryUsers.contains(repositoryModel.owner)) {
-							repositoryUsers.add(repositoryModel.owner);
-						}
-						GitBlit.self().setRepositoryUsers(repositoryModel, repositoryUsers);
-
-						// save the team access list
-						Iterator<String> teams = teamsPalette.getSelectedChoices();
-						List<String> repositoryTeams = new ArrayList<String>();
-						while (teams.hasNext()) {
-							repositoryTeams.add(teams.next());
-						}
-						GitBlit.self().setRepositoryTeams(repositoryModel, repositoryTeams);
+						GitBlit.self().setUserAccessPermissions(repositoryModel, repositoryUsers);
+						GitBlit.self().setTeamAccessPermissions(repositoryModel, repositoryTeams);
 					}
 				} catch (GitBlitException e) {
 					error(e.getMessage());
@@ -266,12 +375,14 @@
 		form.add(new SimpleAttributeModifier("autocomplete", "off"));
 
 		// field names reflective match RepositoryModel fields
-		form.add(new TextField<String>("name").setEnabled(isCreate || isAdmin));
+		form.add(new TextField<String>("name").setEnabled(allowEditName));
 		form.add(new TextField<String>("description"));
 		form.add(new DropDownChoice<String>("owner", GitBlit.self().getAllUsernames())
-				.setEnabled(GitBlitWebSession.get().canAdmin()));
-		form.add(new DropDownChoice<AccessRestrictionType>("accessRestriction", Arrays
-				.asList(AccessRestrictionType.values()), new AccessRestrictionRenderer()));
+				.setEnabled(GitBlitWebSession.get().canAdmin() && !repositoryModel.isPersonalRepository()));
+		form.add(new CheckBox("allowForks"));
+		DropDownChoice<AccessRestrictionType> accessRestriction = new DropDownChoice<AccessRestrictionType>("accessRestriction", Arrays
+				.asList(AccessRestrictionType.values()), new AccessRestrictionRenderer());
+		form.add(accessRestriction);
 		form.add(new CheckBox("isFrozen"));
 		// TODO enable origin definition
 		form.add(new TextField<String>("origin").setEnabled(false/* isCreate */));
@@ -281,7 +392,12 @@
 		if (!ArrayUtils.isEmpty(repositoryModel.availableRefs)) {
 			availableRefs.addAll(repositoryModel.availableRefs);
 		}
-		form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(!isCreate));
+		form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(availableRefs.size() > 0));
+
+		boolean gcEnabled = GitBlit.getBoolean(Keys.git.enableGarbageCollection, false); 
+		List<Integer> gcPeriods = Arrays.asList(1, 2, 3, 4, 5, 7, 10, 14 );
+		form.add(new DropDownChoice<Integer>("gcPeriod", gcPeriods, new GCPeriodRenderer()).setEnabled(gcEnabled));
+		form.add(new TextField<String>("gcThreshold").setEnabled(gcEnabled));
 
 		// federation strategies - remove ORIGIN choice if this repository has
 		// no origin.
@@ -301,16 +417,97 @@
 		mailingLists = new Model<String>(ArrayUtils.isEmpty(repositoryModel.mailingLists) ? ""
 				: StringUtils.flattenStrings(repositoryModel.mailingLists, " "));
 		form.add(new TextField<String>("mailingLists", mailingLists));
+		form.add(indexedBranchesPalette);
+		
+		List<AuthorizationControl> acList = Arrays.asList(AuthorizationControl.values());
+		final RadioChoice<AuthorizationControl> authorizationControl = new RadioChoice<Constants.AuthorizationControl>(
+				"authorizationControl", acList, new AuthorizationControlRenderer());
+		form.add(authorizationControl);
+		
+		final CheckBox verifyCommitter = new CheckBox("verifyCommitter");
+		verifyCommitter.setOutputMarkupId(true);
+		form.add(verifyCommitter);
+
 		form.add(usersPalette);
 		form.add(teamsPalette);
 		form.add(federationSetsPalette);
 		form.add(preReceivePalette);
-		form.add(new BulletListPanel("inheritedPreReceive", "inherited", GitBlit.self()
+		form.add(new BulletListPanel("inheritedPreReceive", getString("gb.inherited"), GitBlit.self()
 				.getPreReceiveScriptsInherited(repositoryModel)));
 		form.add(postReceivePalette);
-		form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self()
+		form.add(new BulletListPanel("inheritedPostReceive", getString("gb.inherited"), GitBlit.self()
 				.getPostReceiveScriptsInherited(repositoryModel)));
+		
+		WebMarkupContainer customFieldsSection = new WebMarkupContainer("customFieldsSection");
+		customFieldsSection.add(customFieldsListView);
+		form.add(customFieldsSection.setVisible(!GitBlit.getString(Keys.groovy.customFields, "").isEmpty()));
+		
+		// initial enable/disable of permission controls
+		if (repositoryModel.accessRestriction.equals(AccessRestrictionType.NONE)) {
+			// anonymous everything, disable all controls
+			usersPalette.setEnabled(false);
+			teamsPalette.setEnabled(false);
+			authorizationControl.setEnabled(false);
+			verifyCommitter.setEnabled(false);
+		} else {
+			// authenticated something
+			// enable authorization controls
+			authorizationControl.setEnabled(true);
+			verifyCommitter.setEnabled(true);
+			
+			boolean allowFineGrainedControls = repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);
+			usersPalette.setEnabled(allowFineGrainedControls);
+			teamsPalette.setEnabled(allowFineGrainedControls);
+		}
+		
+		accessRestriction.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+	           
+			private static final long serialVersionUID = 1L;
 
+			protected void onUpdate(AjaxRequestTarget target) {
+				// enable/disable permissions panel based on access restriction
+				boolean allowAuthorizationControl = repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE);
+				authorizationControl.setEnabled(allowAuthorizationControl);
+				verifyCommitter.setEnabled(allowAuthorizationControl);
+				
+				boolean allowFineGrainedControls = allowAuthorizationControl && repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);
+				usersPalette.setEnabled(allowFineGrainedControls);
+				teamsPalette.setEnabled(allowFineGrainedControls);
+				
+				if (allowFineGrainedControls) {
+					repositoryModel.authorizationControl = AuthorizationControl.NAMED;
+				}
+				
+				target.addComponent(authorizationControl);
+				target.addComponent(verifyCommitter);
+				target.addComponent(usersPalette);
+				target.addComponent(teamsPalette);
+			}
+		});
+		
+		authorizationControl.add(new AjaxFormChoiceComponentUpdatingBehavior() {
+	           
+			private static final long serialVersionUID = 1L;
+
+			protected void onUpdate(AjaxRequestTarget target) {
+				// enable/disable permissions panel based on access restriction
+				boolean allowAuthorizationControl = repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE);
+				authorizationControl.setEnabled(allowAuthorizationControl);
+				
+				boolean allowFineGrainedControls = allowAuthorizationControl && repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);
+				usersPalette.setEnabled(allowFineGrainedControls);
+				teamsPalette.setEnabled(allowFineGrainedControls);
+				
+				if (allowFineGrainedControls) {
+					repositoryModel.authorizationControl = AuthorizationControl.NAMED;
+				}
+				
+				target.addComponent(authorizationControl);
+				target.addComponent(usersPalette);
+				target.addComponent(teamsPalette);
+			}
+		});
+		
 		form.add(new Button("save"));
 		Button cancel = new Button("cancel") {
 			private static final long serialVersionUID = 1L;
@@ -344,31 +541,31 @@
 			if (authenticateAdmin) {
 				if (user == null) {
 					// No Login Available
-					error("Administration requires a login", true);
+					error(getString("gb.errorAdminLoginRequired"), true);
 				}
 				if (isCreate) {
 					// Create Repository
-					if (!user.canAdmin) {
-						// Only Administrators May Create
-						error("Only an administrator may create a repository", true);
+					if (!user.canCreate() && !user.canAdmin()) {
+						// Only administrators or permitted users may create
+						error(getString("gb.errorOnlyAdminMayCreateRepository"), true);
 					}
 				} else {
 					// Edit Repository
-					if (user.canAdmin) {
+					if (user.canAdmin()) {
 						// Admins can edit everything
 						isAdmin = true;
 						return;
 					} else {
 						if (!model.owner.equalsIgnoreCase(user.username)) {
 							// User is not an Admin nor Owner
-							error("Only an administrator or the owner may edit a repository", true);
+							error(getString("gb.errorOnlyAdminOrOwnerMayEditRepository"), true);
 						}
 					}
 				}
 			}
 		} else {
 			// No Administration Permitted
-			error("Administration is disabled", true);
+			error(getString("gb.errorAdministrationDisabled"), true);
 		}
 	}
 
@@ -413,4 +610,48 @@
 			return Integer.toString(index);
 		}
 	}
+	
+	private class AuthorizationControlRenderer implements IChoiceRenderer<AuthorizationControl> {
+
+		private static final long serialVersionUID = 1L;
+
+		private final Map<AuthorizationControl, String> map;
+
+		public AuthorizationControlRenderer() {
+			map = getAuthorizationControls();
+		}
+
+		@Override
+		public String getDisplayValue(AuthorizationControl type) {
+			return map.get(type);
+		}
+
+		@Override
+		public String getIdValue(AuthorizationControl type, int index) {
+			return Integer.toString(index);
+		}
+	}
+	
+	private class GCPeriodRenderer implements IChoiceRenderer<Integer> {
+
+		private static final long serialVersionUID = 1L;
+
+		public GCPeriodRenderer() {
+		}
+
+		@Override
+		public String getDisplayValue(Integer value) {
+			if (value == 1) {
+				return getString("gb.duration.oneDay");
+			} else {
+				return MessageFormat.format(getString("gb.duration.days"), value);
+			}
+		}
+
+		@Override
+		public String getIdValue(Integer value, int index) {
+			return Integer.toString(index);
+		}
+	}
+	
 }

--
Gitblit v1.9.1