summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/wicket/panels
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-05-30 10:05:06 -0400
committerJames Moger <james.moger@gitblit.com>2014-06-03 10:34:51 -0400
commit5779988cf3a1d737322b2b6a1d568da8713509e7 (patch)
tree557814c1cfc09de5e1498ffff4bacfa975319388 /src/main/java/com/gitblit/wicket/panels
parenta3456e22504a0a054312989fd52a21e4d193baf7 (diff)
downloadgitblit-5779988cf3a1d737322b2b6a1d568da8713509e7.tar.gz
gitblit-5779988cf3a1d737322b2b6a1d568da8713509e7.zip
Use RepositoryNamePanel in EditRepositoryPage, rename AccessPolicyPanel
Diffstat (limited to 'src/main/java/com/gitblit/wicket/panels')
-rw-r--r--src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html (renamed from src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html)7
-rw-r--r--src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java (renamed from src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java)70
-rw-r--r--src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html7
-rw-r--r--src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java83
4 files changed, 105 insertions, 62 deletions
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
index 6a4d5cef..38fa7f6a 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.html
@@ -7,8 +7,11 @@
<body>
<wicket:panel>
- <span wicket:id="permissionsGroup">
- <div wicket:id="permissions">
+ <h4><wicket:message key="gb.accessPolicy"></wicket:message></h4>
+ <p><wicket:message key="gb.accessPolicyDescription"></wicket:message></p>
+
+ <span wicket:id="policiesGroup">
+ <div wicket:id="policies">
<div style="display: inline-block;vertical-align: top;">
<input type="radio" wicket:id="radio" />
<img wicket:id="image"></img>
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
index ed3f1fed..a115e251 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryPermissionPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
@@ -38,15 +38,15 @@ import com.gitblit.wicket.WicketUtils;
* @author James Moger
*
*/
-public class RepositoryPermissionPanel extends BasePanel {
+public class AccessPolicyPanel extends BasePanel {
private static final long serialVersionUID = 1L;
private final RepositoryModel repository;
- private RadioGroup<Permission> permissionGroup;
+ private RadioGroup<AccessPolicy> policiesGroup;
- public RepositoryPermissionPanel(String wicketId, RepositoryModel repository) {
+ public AccessPolicyPanel(String wicketId, RepositoryModel repository) {
super(wicketId);
this.repository = repository;
}
@@ -55,44 +55,44 @@ public class RepositoryPermissionPanel extends BasePanel {
protected void onInitialize() {
super.onInitialize();
- Permission anonymousPermission = new Permission(getString("gb.anonymousPush"),
- getString("gb.anonymousPushDescription"),
+ AccessPolicy anonymousPolicy = new AccessPolicy(getString("gb.anonymousPolicy"),
+ getString("gb.anonymousPolicyDescription"),
"blank.png",
AuthorizationControl.AUTHENTICATED,
AccessRestrictionType.NONE);
- Permission authenticatedPermission = new Permission(getString("gb.pushRestrictedAuthenticated"),
- getString("gb.pushRestrictedAuthenticatedDescription"),
+ AccessPolicy authenticatedPushPolicy = new AccessPolicy(getString("gb.authenticatedPushPolicy"),
+ getString("gb.authenticatedPushPolicyDescription"),
"lock_go_16x16.png",
AuthorizationControl.AUTHENTICATED,
AccessRestrictionType.PUSH);
- Permission publicPermission = new Permission(getString("gb.pushRestrictedNamed"),
- getString("gb.pushRestrictedNamedDescription"),
+ AccessPolicy namedPushPolicy = new AccessPolicy(getString("gb.namedPushPolicy"),
+ getString("gb.namedPushPolicyDescription"),
"lock_go_16x16.png",
AuthorizationControl.NAMED,
AccessRestrictionType.PUSH);
- Permission protectedPermission = new Permission(getString("gb.cloneRestricted"),
- getString("gb.cloneRestrictedDescription"),
+ AccessPolicy clonePolicy = new AccessPolicy(getString("gb.clonePolicy"),
+ getString("gb.clonePolicyDescription"),
"lock_pull_16x16.png",
AuthorizationControl.NAMED,
AccessRestrictionType.CLONE);
- Permission privatePermission = new Permission(getString("gb.private"),
- getString("gb.privateRepoDescription"),
+ AccessPolicy viewPolicy = new AccessPolicy(getString("gb.viewPolicy"),
+ getString("gb.viewPolicyDescription"),
"shield_16x16.png",
AuthorizationControl.NAMED,
AccessRestrictionType.VIEW);
- List<Permission> permissions = new ArrayList<Permission>();
+ List<AccessPolicy> policies = new ArrayList<AccessPolicy>();
if (app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)) {
- permissions.add(anonymousPermission);
+ policies.add(anonymousPolicy);
}
- permissions.add(authenticatedPermission);
- permissions.add(publicPermission);
- permissions.add(protectedPermission);
- permissions.add(privatePermission);
+ policies.add(authenticatedPushPolicy);
+ policies.add(namedPushPolicy);
+ policies.add(clonePolicy);
+ policies.add(viewPolicy);
AccessRestrictionType defaultRestriction = repository.accessRestriction;
if (defaultRestriction == null) {
@@ -106,38 +106,38 @@ public class RepositoryPermissionPanel extends BasePanel {
AuthorizationControl.NAMED.name()));
}
- Permission defaultPermission = publicPermission;
- for (Permission permission : permissions) {
- if (permission.type == defaultRestriction && permission.control == defaultControl) {
- defaultPermission = permission;
+ AccessPolicy defaultPolicy = namedPushPolicy;
+ for (AccessPolicy policy : policies) {
+ if (policy.type == defaultRestriction && policy.control == defaultControl) {
+ defaultPolicy = policy;
}
}
- permissionGroup = new RadioGroup<>("permissionsGroup", new Model<Permission>(defaultPermission));
- ListView<Permission> permissionsList = new ListView<Permission>("permissions", permissions) {
+ policiesGroup = new RadioGroup<>("policiesGroup", new Model<AccessPolicy>(defaultPolicy));
+ ListView<AccessPolicy> policiesList = new ListView<AccessPolicy>("policies", policies) {
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()));
+ protected void populateItem(ListItem<AccessPolicy> item) {
+ AccessPolicy p = item.getModelObject();
+ item.add(new Radio<AccessPolicy>("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);
+ policiesGroup.add(policiesList);
setOutputMarkupId(true);
- add(permissionGroup);
+ add(policiesGroup);
}
public void updateModel(RepositoryModel repository) {
- Permission permission = permissionGroup.getModelObject();
- repository.authorizationControl = permission.control;
- repository.accessRestriction = permission.type;
+ AccessPolicy policy = policiesGroup.getModelObject();
+ repository.authorizationControl = policy.control;
+ repository.accessRestriction = policy.type;
}
@Override
@@ -145,7 +145,7 @@ public class RepositoryPermissionPanel extends BasePanel {
return false;
}
- private static class Permission implements Serializable {
+ private static class AccessPolicy implements Serializable {
private static final long serialVersionUID = 1L;
@@ -155,7 +155,7 @@ public class RepositoryPermissionPanel extends BasePanel {
final AuthorizationControl control;
final AccessRestrictionType type;
- Permission(String name, String description, String img, AuthorizationControl control, AccessRestrictionType type) {
+ AccessPolicy(String name, String description, String img, AuthorizationControl control, AccessRestrictionType type) {
this.name = name;
this.description = description;
this.image = img;
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
index f3a0738e..3c651620 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.html
@@ -11,16 +11,19 @@
<tbody class="settings">
<tr>
<th><wicket:message key="gb.project"></wicket:message></th>
- <td></td>
<th><wicket:message key="gb.name"></wicket:message></th>
</tr>
<tr>
<td><select class="span2" wicket:id="projectPath" /></td>
- <td style="font-size:24px;color:#ccc;">/</td>
<td class="edit"><input class="span3" type="text" wicket:id="name" id="name" /> &nbsp;<span class="help-inline"><wicket:message key="gb.nameDescription"></wicket:message></span></td>
</tr>
</tbody>
</table>
+
+ <div>
+ <b><wicket:message key="gb.description"></wicket:message></b><br/>
+ <input class="span5" type="text" wicket:id="description" />
+ </div>
</wicket:panel>
</body>
diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
index 7b20adec..358ff59b 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryNamePanel.java
@@ -17,18 +17,20 @@ package com.gitblit.wicket.panels;
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.TextField;
+import com.gitblit.models.ProjectModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
/**
- * A radio group panel of the 5 available authorization/access restriction combinations.
+ * A panel for naming a repository, specifying it's project, and entering a description.
*
* @author James Moger
*
@@ -37,44 +39,79 @@ public class RepositoryNamePanel extends BasePanel {
private static final long serialVersionUID = 1L;
- private final RepositoryModel repository;
-
private String fullName;
+ private DropDownChoice<String> projectChoice;
+
+ private TextField<String> nameField;
+
public RepositoryNamePanel(String wicketId, RepositoryModel repository) {
super(wicketId);
- this.repository = repository;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
GitBlitWebSession session = GitBlitWebSession.get();
UserModel user = session.getUser();
- // build project list for repository destination
+ // build project set for repository destination
String defaultProject = null;
- List<String> projects = new ArrayList<String>();
+ Set<String> projectNames = new TreeSet<String>();
+
+ // add the registered/known projects
+ for (ProjectModel project : app().projects().getProjectModels(user, false)) {
+ // TODO issue-351: user.canAdmin(project)
+ if (user.canAdmin()) {
+ if (project.isRoot) {
+ projectNames.add("/");
+ } else {
+ projectNames.add(project.name + "/");
+ }
+ }
+ }
- if (user.canAdmin()) {
- projects.add("/");
- defaultProject = "/";
+ // add the user's personal project namespace
+ if (user.canAdmin() || user.canCreate()) {
+ projectNames.add(user.getPersonalPath() + "/");
}
- if (user.canCreate()) {
- String p = user.getPersonalPath() + "/";
- projects.add(p);
- if (defaultProject == null) {
- // only prefer personal namespace if default is not already set
- defaultProject = p;
+ if (!StringUtils.isEmpty(repository.name)) {
+ // editing a repository name
+ // set the defaultProject to the current repository project
+ defaultProject = repository.projectPath;
+ if (StringUtils.isEmpty(defaultProject)) {
+ defaultProject = "/";
+ } else {
+ defaultProject += "/";
+ }
+
+ projectNames.add(defaultProject);
+ }
+
+ // if default project is not already set, set preference based on the user permissions
+ if (defaultProject == null) {
+ if (user.canAdmin()) {
+ defaultProject = "/";
+ } else if (user.canCreate()) {
+ defaultProject = user.getPersonalPath() + "/";
}
}
+ // update the model which is reflectively mapped to the Wicket fields by name
repository.projectPath = defaultProject;
+ if (repository.projectPath.length() > 1 && !StringUtils.isEmpty(repository.name)) {
+ repository.name = repository.name.substring(repository.projectPath.length());
+ }
+ projectChoice = new DropDownChoice<String>("projectPath", new ArrayList<String>(projectNames));
+ nameField = new TextField<String>("name");
+
+ // only enable project selection if we actually have multiple choices
+ add(projectChoice.setEnabled(projectNames.size() > 1));
+ add(nameField);
+ add(new TextField<String>("description"));
+ }
- add(new DropDownChoice<String>("projectPath", projects));
- add(new TextField<String>("name"));
+ public void setEditable(boolean editable) {
+ // only enable project selection if we actually have multiple choices
+ projectChoice.setEnabled(projectChoice.getChoices().size() > 1 && editable);
+ nameField.setEnabled(editable);
}
public boolean updateModel(RepositoryModel repositoryModel) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 17:59:16 +0000