From 2c50880dbd5de292e37d2533fccfcb62f6be9f95 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 03 Jun 2014 10:34:51 -0400
Subject: [PATCH] Extract authorization/access selection panel to re-usable class
---
src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java | 74 ++++++-------------------------------
1 files changed, 12 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
index b0cc3e9..cd0cef6 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
@@ -17,7 +17,6 @@
import java.io.File;
import java.io.IOException;
-import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -27,16 +26,11 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.behavior.SimpleAttributeModifier;
-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.Radio;
-import org.apache.wicket.markup.html.form.RadioGroup;
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;
@@ -67,15 +61,16 @@
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.panels.RepositoryPermissionPanel;
public class NewRepositoryPage extends RootSubPage {
private final RepositoryModel repositoryModel;
- private RadioGroup<Permission> permissionGroup;
private IModel<Boolean> addReadmeModel;
private Model<String> gitignoreModel;
private IModel<Boolean> addGitflowModel;
private IModel<Boolean> addGitignoreModel;
+ private RepositoryPermissionPanel permissionPanel;
public NewRepositoryPage() {
// create constructor
@@ -148,9 +143,7 @@
repositoryModel.name = fullName;
repositoryModel.projectPath = null;
- Permission permisison = permissionGroup.getModelObject();
- repositoryModel.accessRestriction = permisison.type;
- repositoryModel.authorizationControl = AuthorizationControl.NAMED;
+ permissionPanel.setPermission(repositoryModel);
repositoryModel.owners = new ArrayList<String>();
repositoryModel.owners.add(GitBlitWebSession.get().getUsername());
@@ -229,50 +222,24 @@
form.add(new TextField<String>("name"));
form.add(new TextField<String>("description"));
- Permission anonymousPermission = new Permission(getString("gb.anonymous"), getString("gb.anonymousRepoDescription"), "blank.png", AccessRestrictionType.NONE);
- Permission publicPermission = new Permission(getString("gb.public"), getString("gb.publicRepoDescription"), "lock_go_16x16.png", AccessRestrictionType.PUSH);
- Permission protectedPermission = new Permission(getString("gb.protected"), getString("gb.protectedRepoDescription"), "lock_pull_16x16.png", AccessRestrictionType.CLONE);
- Permission privatePermission = new Permission(getString("gb.private"), getString("gb.privateRepoDescription"), "shield_16x16.png", AccessRestrictionType.VIEW);
-
- List<Permission> permissions = new ArrayList<Permission>();
- if (app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)) {
- permissions.add(anonymousPermission);
- }
- permissions.add(publicPermission);
- permissions.add(protectedPermission);
- permissions.add(privatePermission);
-
- // determine default permission selection
+ // prepare the default access controls
AccessRestrictionType defaultRestriction = AccessRestrictionType.fromName(
app().settings().getString(Keys.git.defaultAccessRestriction, AccessRestrictionType.PUSH.name()));
if (AccessRestrictionType.NONE == defaultRestriction) {
defaultRestriction = AccessRestrictionType.PUSH;
}
+ AuthorizationControl defaultControl = AuthorizationControl.fromName(
+ app().settings().getString(Keys.git.defaultAuthorizationControl, AuthorizationControl.NAMED.name()));
- Permission defaultPermission = publicPermission;
- for (Permission permission : permissions) {
- if (permission.type == defaultRestriction) {
- defaultPermission = permission;
- }
+ if (AuthorizationControl.AUTHENTICATED == defaultControl) {
+ defaultRestriction = AccessRestrictionType.PUSH;
}
- permissionGroup = new RadioGroup<>("permissionsGroup", new Model<Permission>(defaultPermission));
- form.add(permissionGroup);
+ repositoryModel.authorizationControl = defaultControl;
+ repositoryModel.accessRestriction = defaultRestriction;
- ListView<Permission> permissionsList = new ListView<Permission>("permissions", permissions) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(ListItem<Permission> item) {
- Permission p = item.getModelObject();
- item.add(new Radio<Permission>("radio", item.getModel()));
- item.add(WicketUtils.newImage("image", p.image));
- item.add(new Label("name", p.name));
- item.add(new Label("description", p.description));
- }
- };
- permissionGroup.add(permissionsList);
+ permissionPanel = new RepositoryPermissionPanel("permissionPanel", repositoryModel);
+ form.add(permissionPanel);
//
// initial commit options
@@ -472,22 +439,5 @@
db.close();
}
return success;
- }
-
- private static class Permission implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- final String name;
- final String description;
- final String image;
- final AccessRestrictionType type;
-
- Permission(String name, String description, String img, AccessRestrictionType type) {
- this.name = name;
- this.description = description;
- this.image = img;
- this.type = type;
- }
}
}
--
Gitblit v1.9.1