From 8a8bc3dc1bc810cef952a12071b6ec7dd8ff9750 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 20 Oct 2014 09:33:07 -0400 Subject: [PATCH] Prepare v1.6.1 documentation updates --- src/main/java/com/gitblit/wicket/pages/EditUserPage.java | 56 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java index d0e52f4..454aa61 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java +++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java @@ -54,10 +54,6 @@ public EditUserPage() { // create constructor super(); - if (!app().users().supportsAddUser()) { - error(MessageFormat.format(getString("gb.userServiceDoesNotPermitAddUser"), - app().settings().getString(Keys.realm.userService, "${baseFolder}/users.conf")), true); - } isCreate = true; setupPage(new UserModel("")); setStatelessHint(false); @@ -110,7 +106,7 @@ final Palette<String> teams = new Palette<String>("teams", new ListModel<String>( new ArrayList<String>(userTeams)), new CollectionModel<String>(app().users() - .getAllTeamnames()), new StringChoiceRenderer(), 10, false); + .getAllTeamNames()), new StringChoiceRenderer(), 10, false); Form<UserModel> form = new Form<UserModel>("editForm", model) { private static final long serialVersionUID = 1L; @@ -138,7 +134,7 @@ } boolean rename = !StringUtils.isEmpty(oldName) && !oldName.equalsIgnoreCase(username); - if (app().users().supportsCredentialChanges(userModel)) { + if (app().authentication().supportsCredentialChanges(userModel)) { if (!userModel.password.equals(confirmPassword.getObject())) { error(getString("gb.passwordsDoNotMatch")); return; @@ -157,6 +153,9 @@ minLength)); return; } + + // change the cookie + userModel.cookie = StringUtils.getSHA1(userModel.username + password); // Optionally store the password MD5 digest. String type = app().settings().getString(Keys.realm.passwordStorage, "md5"); @@ -192,7 +191,11 @@ } try { - app().users().updateUserModel(oldName, userModel, isCreate); + if (isCreate) { + app().gitblit().addUser(userModel); + } else { + app().gitblit().reviseUser(oldName, userModel); + } } catch (GitBlitException e) { error(e.getMessage()); return; @@ -214,16 +217,16 @@ form.add(new SimpleAttributeModifier("autocomplete", "off")); // not all user services support manipulating username and password - boolean editCredentials = app().users().supportsCredentialChanges(userModel); + boolean editCredentials = app().authentication().supportsCredentialChanges(userModel); // not all user services support manipulating display name - boolean editDisplayName = app().users().supportsDisplayNameChanges(userModel); + boolean editDisplayName = app().authentication().supportsDisplayNameChanges(userModel); // not all user services support manipulating email address - boolean editEmailAddress = app().users().supportsEmailAddressChanges(userModel); + boolean editEmailAddress = app().authentication().supportsEmailAddressChanges(userModel); // not all user services support manipulating team memberships - boolean editTeams = app().users().supportsTeamMembershipChanges(userModel); + boolean editTeams = app().authentication().supportsTeamMembershipChanges(userModel); // field names reflective match UserModel fields form.add(new TextField<String>("username").setEnabled(editCredentials)); @@ -236,10 +239,35 @@ form.add(confirmPasswordField.setEnabled(editCredentials)); 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").setEnabled(app().settings().getBoolean(Keys.web.allowForking, true))); - form.add(new CheckBox("canCreate")); + + if (userModel.canAdmin() && !userModel.canAdmin) { + // user inherits Admin permission + // display a disabled-yet-checked checkbox + form.add(new CheckBox("canAdmin", Model.of(true)).setEnabled(false)); + } else { + form.add(new CheckBox("canAdmin")); + } + + if (userModel.canFork() && !userModel.canFork) { + // user inherits Fork permission + // display a disabled-yet-checked checkbox + form.add(new CheckBox("canFork", Model.of(true)).setEnabled(false)); + } else { + final boolean forkingAllowed = app().settings().getBoolean(Keys.web.allowForking, true); + form.add(new CheckBox("canFork").setEnabled(forkingAllowed)); + } + + if (userModel.canCreate() && !userModel.canCreate) { + // user inherits Create permission + // display a disabled-yet-checked checkbox + form.add(new CheckBox("canCreate", Model.of(true)).setEnabled(false)); + } else { + form.add(new CheckBox("canCreate")); + } + form.add(new CheckBox("excludeFromFederation")); + form.add(new CheckBox("disabled")); + form.add(new RegistrantPermissionsPanel("repositories", RegistrantType.REPOSITORY, repos, permissions, getAccessPermissions())); form.add(teams.setEnabled(editTeams)); -- Gitblit v1.9.1