Jeroen Baten
2013-01-04 9af47c10c6a268877c1d232c8d71ee6df4f8a7ab
src/com/gitblit/wicket/pages/EditUserPage.java
@@ -33,15 +33,12 @@
import org.apache.wicket.model.Model;
import org.apache.wicket.model.util.CollectionModel;
import org.apache.wicket.model.util.ListModel;
import org.slf4j.LoggerFactory;
import com.gitblit.Constants.PermissionType;
import com.gitblit.Constants.RegistrantType;
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;
import com.gitblit.utils.StringUtils;
@@ -105,24 +102,7 @@
      Collections.sort(userTeams);
      
      final String oldName = userModel.username;
      final List<RegistrantAccessPermission> permissions = userModel.getRepositoryPermissions();
      for (RegistrantAccessPermission permission : permissions) {
         if (permission.isEditable && PermissionType.EXPLICIT.equals(permission.permissionType)) {
            // Ensure this is NOT an owner permission - which is non-editable
            // We don't know this from within the usermodel, ownership is a
            // property of a repository.
            RepositoryModel rm = GitBlit.self().getRepositoryModel(permission.registrant);
            if (rm == null) {
               LoggerFactory.getLogger(getClass()).error("Missing repository " + permission.registrant, new NullPointerException());
               continue;
            }
            boolean isOwner = rm.isOwner(oldName);
            if (isOwner) {
               permission.permissionType = PermissionType.OWNER;
               permission.isEditable = false;
            }
         }
      }
      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()
@@ -253,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",   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;