Merge pull request #12 from jcrygier/ldap_unboundid

James Moger

2012-04-24 0cb7a9c08cfaebeace058dc806099051f163f172

 src/com/gitblit/wicket/pages/EditUserPage.java

@@ -54,6 +54,10 @@
   public EditUserPage() {

      // create constructor

      super();

      if (!GitBlit.self().supportsCredentialChanges()) {

         error(MessageFormat.format(getString("gb.userServiceDoesNotPermitAddUser"),

               GitBlit.getString(Keys.realm.userService, "users.conf")), true);

      }

      isCreate = true;

      setupPage(new UserModel(""));

   }

@@ -125,6 +129,7 @@
            }

            boolean rename = !StringUtils.isEmpty(oldName)

                  && !oldName.equalsIgnoreCase(username);

            if (GitBlit.self().supportsCredentialChanges()) {

            if (!userModel.password.equals(confirmPassword.getObject())) {

               error(getString("gb.passwordsDoNotMatch"));

               return;

@@ -159,6 +164,7 @@
                  && password.toUpperCase().startsWith(StringUtils.COMBINED_MD5_TYPE)) {

               error(getString("gb.combinedMd5Rename"));

               return;

               }

            }



            Iterator<String> selectedRepositories = repositories.getSelectedChoices();

@@ -201,19 +207,25 @@
      // do not let the browser pre-populate these fields

      form.add(new SimpleAttributeModifier("autocomplete", "off"));



      // not all user services support manipulating username and password

      boolean editCredentials = GitBlit.self().supportsCredentialChanges();



      // not all user services support manipulating team memberships

      boolean editTeams = GitBlit.self().supportsTeamMembershipChanges();



      // field names reflective match UserModel fields

      form.add(new TextField<String>("username"));

      form.add(new TextField<String>("username").setEnabled(editCredentials));

      PasswordTextField passwordField = new PasswordTextField("password");

      passwordField.setResetPassword(false);

      form.add(passwordField);

      form.add(passwordField.setEnabled(editCredentials));

      PasswordTextField confirmPasswordField = new PasswordTextField("confirmPassword",

            confirmPassword);

      confirmPasswordField.setResetPassword(false);

      form.add(confirmPasswordField);

      form.add(confirmPasswordField.setEnabled(editCredentials));

      form.add(new CheckBox("canAdmin"));

      form.add(new CheckBox("excludeFromFederation"));

      form.add(repositories);

      form.add(teams);

      form.add(teams.setEnabled(editTeams));



      form.add(new Button("save"));

      Button cancel = new Button("cancel") {