From ea936aa63d7a756ca7d0284f76b830656d1e8918 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 27 Sep 2011 09:49:57 -0400 Subject: [PATCH] Documentation. --- src/com/gitblit/wicket/pages/EditUserPage.java | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java index fb647f7..a358911 100644 --- a/src/com/gitblit/wicket/pages/EditUserPage.java +++ b/src/com/gitblit/wicket/pages/EditUserPage.java @@ -22,6 +22,7 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.extensions.markup.html.form.palette.Palette; +import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.Form; @@ -31,8 +32,6 @@ import org.apache.wicket.model.Model; import org.apache.wicket.model.util.CollectionModel; import org.apache.wicket.model.util.ListModel; -import org.eclipse.jetty.http.security.Credential.Crypt; -import org.eclipse.jetty.http.security.Credential.MD5; import com.gitblit.Constants.AccessRestrictionType; import com.gitblit.GitBlit; @@ -84,8 +83,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; @@ -114,8 +113,7 @@ return; } String password = userModel.password; - if (!password.toUpperCase().startsWith(Crypt.__TYPE) - && !password.toUpperCase().startsWith(MD5.__TYPE)) { + if (!password.toUpperCase().startsWith(StringUtils.MD5_TYPE)) { // This is a plain text password. // Check length. int minLength = GitBlit.getInteger(Keys.realm.minPasswordLength, 5); @@ -133,18 +131,20 @@ String type = GitBlit.getString(Keys.realm.passwordStorage, "md5"); if (type.equalsIgnoreCase("md5")) { // store MD5 digest of password - userModel.password = MD5.digest(userModel.password); + userModel.password = StringUtils.MD5_TYPE + + StringUtils.getMD5(userModel.password); } } Iterator<String> selectedRepositories = repositories.getSelectedChoices(); List<String> repos = new ArrayList<String>(); while (selectedRepositories.hasNext()) { - repos.add(selectedRepositories.next()); + repos.add(selectedRepositories.next().toLowerCase()); } - userModel.setRepositories(repos); + userModel.repositories.clear(); + userModel.repositories.addAll(repos); try { - GitBlit.self().editUserModel(oldName, userModel, isCreate); + GitBlit.self().updateUserModel(oldName, userModel, isCreate); } catch (GitBlitException e) { error(e.getMessage()); return; @@ -172,7 +172,21 @@ confirmPasswordField.setResetPassword(false); form.add(confirmPasswordField); form.add(new CheckBox("canAdmin")); + form.add(new CheckBox("excludeFromFederation")); form.add(repositories); + + form.add(new Button("save")); + Button cancel = new Button("cancel") { + private static final long serialVersionUID = 1L; + + @Override + public void onSubmit() { + setResponsePage(RepositoriesPage.class); + } + }; + cancel.setDefaultFormProcessing(false); + form.add(cancel); + add(form); } } -- Gitblit v1.9.1