Merge pull request #75 from thefake/master

James Moger

2013-02-25 9effe1630d97039b3e01cd9b58ed07e75be1d63c

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

@@ -34,6 +34,7 @@
import org.apache.wicket.model.util.CollectionModel;

import org.apache.wicket.model.util.ListModel;



import com.gitblit.Constants.RegistrantType;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

@@ -54,13 +55,14 @@
   public EditUserPage() {

      // create constructor

      super();

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

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

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

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

               GitBlit.getString(Keys.realm.userService, "${baseFolder}/users.conf")), true);

      }

      isCreate = true;

      setupPage(new UserModel(""));

      setStatelessHint(false);

      setOutputMarkupId(true);

   }



   public EditUserPage(PageParameters params) {

@@ -71,6 +73,12 @@
      UserModel model = GitBlit.self().getUserModel(name);

      setupPage(model);

      setStatelessHint(false);

      setOutputMarkupId(true);

   }

	
   @Override

   protected boolean requiresPageMap() {

      return true;

   }



   protected void setupPage(final UserModel userModel) {

@@ -85,7 +93,7 @@
      CompoundPropertyModel<UserModel> model = new CompoundPropertyModel<UserModel>(userModel);



      // build list of projects including all repositories wildcards

      List<String> repos = getAccessRestrictedRepositoryList(true);

      List<String> repos = getAccessRestrictedRepositoryList(true, userModel);

      

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

      for (TeamModel team : userModel.teams) {

@@ -94,7 +102,7 @@
      Collections.sort(userTeams);

      

      final String oldName = userModel.username;

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

      final List<RegistrantAccessPermission> permissions = GitBlit.self().getUserAccessPermissions(userModel);



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

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

@@ -126,7 +134,7 @@
            }

            boolean rename = !StringUtils.isEmpty(oldName)

                  && !oldName.equalsIgnoreCase(username);

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

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

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

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

                  return;

@@ -202,16 +210,16 @@
      form.add(new SimpleAttributeModifier("autocomplete", "off"));

      

      // not all user services support manipulating username and password

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

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

      

      // not all user services support manipulating display name

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

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



      // not all user services support manipulating email address

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

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



      // not all user services support manipulating team memberships

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

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



      // field names reflective match UserModel fields

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

@@ -225,12 +233,17 @@
      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("canFork").setEnabled(GitBlit.getBoolean(Keys.web.allowForking, true)));

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

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

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

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

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



      form.add(new TextField<String>("organizationalUnit").setEnabled(editDisplayName));

      form.add(new TextField<String>("organization").setEnabled(editDisplayName));

      form.add(new TextField<String>("locality").setEnabled(editDisplayName));

      form.add(new TextField<String>("stateProvince").setEnabled(editDisplayName));

      form.add(new TextField<String>("countryCode").setEnabled(editDisplayName));

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

      Button cancel = new Button("cancel") {

         private static final long serialVersionUID = 1L;