From 6e666fcdbbafedb583a13186fefac3fdd2c1a791 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Oct 2011 17:35:35 -0400
Subject: [PATCH] Fixed minor bug in flatten strings
---
src/com/gitblit/wicket/pages/EditUserPage.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java
index dd50d56..78e9461 100644
--- a/src/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/com/gitblit/wicket/pages/EditUserPage.java
@@ -44,7 +44,7 @@
import com.gitblit.wicket.WicketUtils;
@RequiresAdminRole
-public class EditUserPage extends BasePage {
+public class EditUserPage extends RootSubPage {
private final boolean isCreate;
@@ -66,10 +66,11 @@
protected void setupPage(final UserModel userModel) {
if (isCreate) {
- super.setupPage("", getString("gb.newUser"));
+ super.setupPage(getString("gb.newUser"), "");
} else {
- super.setupPage("", getString("gb.edit"));
+ super.setupPage(getString("gb.edit"), userModel.username);
}
+
final Model<String> confirmPassword = new Model<String>(
StringUtils.isEmpty(userModel.password) ? "" : userModel.password);
CompoundPropertyModel<UserModel> model = new CompoundPropertyModel<UserModel>(userModel);
@@ -83,8 +84,8 @@
}
final String oldName = userModel.username;
final Palette<String> repositories = new Palette<String>("repositories",
- new ListModel<String>(userModel.repositories), new CollectionModel<String>(repos),
- new ChoiceRenderer<String>("", ""), 10, false);
+ new ListModel<String>(new ArrayList<String>(userModel.repositories)),
+ new CollectionModel<String>(repos), new ChoiceRenderer<String>("", ""), 10, false);
Form<UserModel> form = new Form<UserModel>("editForm", model) {
private static final long serialVersionUID = 1L;
@@ -156,8 +157,8 @@
userModel.username));
setResponsePage(EditUserPage.class);
} else {
- // back to home
- setResponsePage(RepositoriesPage.class);
+ // back to users page
+ setResponsePage(UsersPage.class);
}
}
};
@@ -172,6 +173,7 @@
confirmPasswordField.setResetPassword(false);
form.add(confirmPasswordField);
form.add(new CheckBox("canAdmin"));
+ form.add(new CheckBox("excludeFromFederation"));
form.add(repositories);
form.add(new Button("save"));
@@ -180,7 +182,7 @@
@Override
public void onSubmit() {
- setResponsePage(RepositoriesPage.class);
+ setResponsePage(UsersPage.class);
}
};
cancel.setDefaultFormProcessing(false);
--
Gitblit v1.9.1