From 751d7b0f979ffc98836f163d15b69b1fdf9360bf Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jan 2013 19:14:25 -0500
Subject: [PATCH] Updated IDEA module descriptor for JGit 2.2.0

---
 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 80f09db..7a01fb6 100644
--- a/src/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/com/gitblit/wicket/pages/EditUserPage.java
@@ -233,12 +233,17 @@
 		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;

--
Gitblit v1.9.1