Split edit repository page into tabs

James Moger

2012-10-19 79dfe69726b6255464599ab852018e4d2ff96fdc

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

@@ -38,6 +38,7 @@
import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.TeamModel;

import com.gitblit.models.UserModel;

@@ -45,17 +46,23 @@
import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.RegistrantPermissionsPanel;



@RequiresAdminRole

public class EditUserPage extends RootSubPage {



   private final boolean isCreate;



	
   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(""));

      setStatelessHint(false);

   }



   public EditUserPage(PageParameters params) {

@@ -65,6 +72,7 @@
      String name = WicketUtils.getUsername(params);

      UserModel model = GitBlit.self().getUserModel(name);

      setupPage(model);

      setStatelessHint(false);

   }



   protected void setupPage(final UserModel userModel) {

@@ -85,6 +93,8 @@
            repos.add(repo);

         }

      }

      StringUtils.sortRepositorynames(repos);

		
      List<String> userTeams = new ArrayList<String>();

      for (TeamModel team : userModel.teams) {

         userTeams.add(team.name);

@@ -92,16 +102,15 @@
      Collections.sort(userTeams);

      

      final String oldName = userModel.username;

      final Palette<String> repositories = new Palette<String>("repositories",

            new ListModel<String>(new ArrayList<String>(userModel.repositories)),

            new CollectionModel<String>(repos), new StringChoiceRenderer(), 10, false);

      final List<RegistrantAccessPermission> permissions = userModel.getRepositoryPermissions();



      final Palette<String> teams = new Palette<String>("teams", new ListModel<String>(

            new ArrayList<String>(userTeams)), new CollectionModel<String>(GitBlit.self()

            .getAllTeamnames()), new StringChoiceRenderer(), 10, false);

      Form<UserModel> form = new Form<UserModel>("editForm", model) {



         private static final long serialVersionUID = 1L;



			
         /*

          * (non-Javadoc)

          * 

@@ -110,7 +119,7 @@
         @Override

         protected void onSubmit() {

            if (StringUtils.isEmpty(userModel.username)) {

               error("Please enter a username!");

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

               return;

            }

            // force username to lower-case

@@ -119,56 +128,54 @@
            if (isCreate) {

               UserModel model = GitBlit.self().getUserModel(username);

               if (model != null) {

                  error(MessageFormat.format("Username ''{0}'' is unavailable.", username));

                  error(MessageFormat.format(getString("gb.usernameUnavailable"), username));

                  return;

               }

            }

            boolean rename = !StringUtils.isEmpty(oldName)

                  && !oldName.equalsIgnoreCase(username);

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

               error("Passwords do not match!");

               return;

            }

            String password = userModel.password;

            if (!password.toUpperCase().startsWith(StringUtils.MD5_TYPE)

                  && !password.toUpperCase().startsWith(StringUtils.COMBINED_MD5_TYPE)) {

               // This is a plain text password.

               // Check length.

               int minLength = GitBlit.getInteger(Keys.realm.minPasswordLength, 5);

               if (minLength < 4) {

                  minLength = 4;

               }

               if (password.trim().length() < minLength) {

                  error(MessageFormat.format(

                        "Password is too short. Minimum length is {0} characters.",

                        minLength));

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

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

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

                  return;

               }



               // Optionally store the password MD5 digest.

               String type = GitBlit.getString(Keys.realm.passwordStorage, "md5");

               if (type.equalsIgnoreCase("md5")) {

                  // store MD5 digest of password

                  userModel.password = StringUtils.MD5_TYPE

                        + StringUtils.getMD5(userModel.password);

               } else if (type.equalsIgnoreCase("combined-md5")) {

                  // store MD5 digest of username+password

                  userModel.password = StringUtils.COMBINED_MD5_TYPE

                        + StringUtils.getMD5(username + userModel.password);

               String password = userModel.password;

               if (!password.toUpperCase().startsWith(StringUtils.MD5_TYPE)

                     && !password.toUpperCase().startsWith(StringUtils.COMBINED_MD5_TYPE)) {

                  // This is a plain text password.

                  // Check length.

                  int minLength = GitBlit.getInteger(Keys.realm.minPasswordLength, 5);

                  if (minLength < 4) {

                     minLength = 4;

                  }

                  if (password.trim().length() < minLength) {

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

                           minLength));

                     return;

                  }

	
                  // Optionally store the password MD5 digest.

                  String type = GitBlit.getString(Keys.realm.passwordStorage, "md5");

                  if (type.equalsIgnoreCase("md5")) {

                     // store MD5 digest of password

                     userModel.password = StringUtils.MD5_TYPE

                           + StringUtils.getMD5(userModel.password);

                  } else if (type.equalsIgnoreCase("combined-md5")) {

                     // store MD5 digest of username+password

                     userModel.password = StringUtils.COMBINED_MD5_TYPE

                           + StringUtils.getMD5(username + userModel.password);

                  }

               } else if (rename

                     && password.toUpperCase().startsWith(StringUtils.COMBINED_MD5_TYPE)) {

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

                  return;

               }

            } else if (rename

                  && password.toUpperCase().startsWith(StringUtils.COMBINED_MD5_TYPE)) {

               error("Gitblit is configured for combined-md5 password hashing. You must enter a new password on account rename.");

               return;

            }



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

            List<String> repos = new ArrayList<String>();

            while (selectedRepositories.hasNext()) {

               repos.add(selectedRepositories.next().toLowerCase());

            // update user permissions

            for (RegistrantAccessPermission repositoryPermission : permissions) {

               userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);

            }

            userModel.repositories.clear();

            userModel.repositories.addAll(repos);



            Iterator<String> selectedTeams = teams.getSelectedChoices();

            userModel.teams.clear();

@@ -189,7 +196,7 @@
            setRedirect(false);

            if (isCreate) {

               // create another user

               info(MessageFormat.format("New user ''{0}'' successfully created.",

               info(MessageFormat.format(getString("gb.userCreated"),

                     userModel.username));

               setResponsePage(EditUserPage.class);

            } else {

@@ -201,20 +208,36 @@
      

      // 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 display name

      boolean editDisplayName = GitBlit.self().supportsDisplayNameChanges();



      // not all user services support manipulating email address

      boolean editEmailAddress = GitBlit.self().supportsEmailAddressChanges();



      // 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 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("canCreate"));

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

      form.add(repositories);

      form.add(teams);

      form.add(new RegistrantPermissionsPanel("repositories",   repos, permissions, getAccessPermissions()));

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



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

      Button cancel = new Button("cancel") {