diff options
| author | Rafael Cavazin <rafaelcavazin@gmail.com> | 2012-12-06 14:25:01 -0200 |
|---|---|---|
| committer | Rafael Cavazin <rafaelcavazin@gmail.com> | 2012-12-06 14:25:01 -0200 |
| commit | d4b95298902c8cea1411fc696ed80028b6091aa7 (patch) | |
| tree | 1ee58f481203ef60c030a3d0119784c37a8b7b3f /src/com/gitblit/wicket/pages/EditUserPage.java | |
| parent | 6aea2fa8aee24114bc59b09bc3c5b68fcd948790 (diff) | |
| parent | dc9735acfc9dcea6b970d18a315cbf8a6997c4f9 (diff) | |
| download | gitblit-d4b95298902c8cea1411fc696ed80028b6091aa7.tar.gz gitblit-d4b95298902c8cea1411fc696ed80028b6091aa7.zip | |
Update from upstream/master
Merge remote-tracking branch 'upstream/master' into translation_to_pt-br
Diffstat (limited to 'src/com/gitblit/wicket/pages/EditUserPage.java')
| -rw-r--r-- | src/com/gitblit/wicket/pages/EditUserPage.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java index 80f09dba..7a01fb68 100644 --- a/src/com/gitblit/wicket/pages/EditUserPage.java +++ b/src/com/gitblit/wicket/pages/EditUserPage.java @@ -233,12 +233,17 @@ public class EditUserPage extends RootSubPage { form.add(new TextField<String>("displayName").setEnabled(editDisplayName));
form.add(new TextField<String>("emailAddress").setEnabled(editEmailAddress));
form.add(new CheckBox("canAdmin"));
- form.add(new CheckBox("canFork"));
+ form.add(new CheckBox("canFork").setEnabled(GitBlit.getBoolean(Keys.web.allowForking, true)));
form.add(new CheckBox("canCreate"));
form.add(new CheckBox("excludeFromFederation"));
form.add(new RegistrantPermissionsPanel("repositories", RegistrantType.REPOSITORY, repos, permissions, getAccessPermissions()));
form.add(teams.setEnabled(editTeams));
+ form.add(new TextField<String>("organizationalUnit").setEnabled(editDisplayName));
+ form.add(new TextField<String>("organization").setEnabled(editDisplayName));
+ form.add(new TextField<String>("locality").setEnabled(editDisplayName));
+ form.add(new TextField<String>("stateProvince").setEnabled(editDisplayName));
+ form.add(new TextField<String>("countryCode").setEnabled(editDisplayName));
form.add(new Button("save"));
Button cancel = new Button("cancel") {
private static final long serialVersionUID = 1L;
|