From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0
---
src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
index 7aa801f..d8dcdce 100644
--- a/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/AccessPolicyPanel.java
@@ -21,7 +21,6 @@
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Radio;
import org.apache.wicket.markup.html.form.RadioGroup;
import org.apache.wicket.markup.html.list.ListItem;
@@ -147,21 +146,19 @@
}
add(policiesGroup);
- allowForks = Model.of(true);
- add(newCheckbox("allowForks",
+ allowForks = Model.of(app().settings().getBoolean(Keys.web.allowForking, true));
+ if (allowForks.getObject()) {
+ Fragment fragment = new Fragment("allowForks", "allowForksFragment", this);
+ fragment.add(new BooleanOption("allowForks",
getString("gb.allowForks"),
getString("gb.allowForksDescription"),
- allowForks).setEnabled(app().settings().getBoolean(Keys.web.allowForking, true)));
+ allowForks));
+ add(fragment);
+ } else {
+ add(new Label("allowForks").setVisible(false));
+ }
setOutputMarkupId(true);
- }
-
- private Fragment newCheckbox(String wicketId, String title, String description, IModel<Boolean> model) {
- Fragment fragment = new Fragment(wicketId, "checkboxOption", this);
- fragment.add(new Label("name", title));
- fragment.add(new Label("description", description));
- fragment.add(new CheckBox("checkbox", model));
- return fragment;
}
public void updateModel(RepositoryModel repository) {
--
Gitblit v1.9.1