Jeroen Baten
2013-01-04 9af47c10c6a268877c1d232c8d71ee6df4f8a7ab
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;
@@ -61,6 +62,7 @@
      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()
@@ -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;