Renamed method to UserModel.canCreate(String repository)

James Moger

2012-10-22 ec7ac2149ba8603ff1455c948c07037bf6ee030c

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

@@ -54,6 +54,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.UserModel;

import com.gitblit.utils.ArrayUtils;

@@ -62,6 +63,7 @@
import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.BulletListPanel;

import com.gitblit.wicket.panels.RegistrantPermissionsPanel;



public class EditRepositoryPage extends RootSubPage {



@@ -83,7 +85,7 @@
      

      GitBlitWebSession session = GitBlitWebSession.get();

      UserModel user = session.getUser();

      if (user != null && user.canCreate && !user.canAdmin) {

      if (user != null && user.canCreate() && !user.canAdmin()) {

         // personal create permissions, inject personal repository path

         model.name = user.getPersonalPath() + "/";

         model.projectPath = user.getPersonalPath();

@@ -94,6 +96,7 @@
      }

      

      setupPage(model);

      setStatelessHint(false);

   }



   public EditRepositoryPage(PageParameters params) {

@@ -103,6 +106,7 @@
      String name = WicketUtils.getRepositoryName(params);

      RepositoryModel model = GitBlit.self().getRepositoryModel(name);

      setupPage(model);

      setStatelessHint(false);

   }



   protected void setupPage(final RepositoryModel repositoryModel) {

@@ -111,8 +115,8 @@


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

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

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

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

      final List<RegistrantAccessPermission> repositoryUsers = new ArrayList<RegistrantAccessPermission>();

      final List<RegistrantAccessPermission> repositoryTeams = new ArrayList<RegistrantAccessPermission>();

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

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



@@ -120,7 +124,7 @@
      final UserModel user = session.getUser() == null ? UserModel.ANONYMOUS : session.getUser();



      if (isCreate) {

         if (user.canAdmin) {

         if (user.canAdmin()) {

            super.setupPage(getString("gb.newRepository"), "");

         } else {

            super.setupPage(getString("gb.newRepository"), user.getDisplayName());

@@ -128,8 +132,8 @@
      } else {

         super.setupPage(getString("gb.edit"), repositoryModel.name);

         if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {

            repositoryUsers.addAll(GitBlit.self().getRepositoryUsers(repositoryModel));

            repositoryTeams.addAll(GitBlit.self().getRepositoryTeams(repositoryModel));

            repositoryUsers.addAll(GitBlit.self().getUserAccessPermissions(repositoryModel));

            repositoryTeams.addAll(GitBlit.self().getTeamAccessPermissions(repositoryModel));

            Collections.sort(repositoryUsers);

         }

         federationSets.addAll(repositoryModel.federationSets);

@@ -139,15 +143,11 @@
      }



      final String oldName = repositoryModel.name;

      // users palette

      final Palette<String> usersPalette = new Palette<String>("users", new ListModel<String>(

            repositoryUsers), new CollectionModel<String>(GitBlit.self().getAllUsernames()),

            new StringChoiceRenderer(), 10, false);



      // teams palette

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

            repositoryTeams), new CollectionModel<String>(GitBlit.self().getAllTeamnames()),

            new StringChoiceRenderer(), 8, false);

      RegistrantPermissionsPanel usersPalette = new RegistrantPermissionsPanel("users", 
            GitBlit.self().getAllUsernames(), repositoryUsers, getAccessPermissions());

      RegistrantPermissionsPanel teamsPalette = new RegistrantPermissionsPanel("teams", 
            GitBlit.self().getAllTeamnames(), repositoryTeams, getAccessPermissions());



      // indexed local branches palette

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

@@ -253,7 +253,7 @@
                  return;

               }

               

               if (user.canCreate && !user.canAdmin) {

               if (user.canCreate() && !user.canAdmin()) {

                  // ensure repository name begins with the user's path

                  if (!repositoryModel.name.startsWith(user.getPersonalPath())) {

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

@@ -342,28 +342,10 @@
               // save the repository

               GitBlit.self().updateRepositoryModel(oldName, repositoryModel, isCreate);



               // repository access

               // repository access permissions

               if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {

                  // save the user access list

                  Iterator<String> users = usersPalette.getSelectedChoices();

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

                  while (users.hasNext()) {

                     repositoryUsers.add(users.next());

                  }

                  // ensure the owner is added to the user list

                  if (repositoryModel.owner != null

                        && !repositoryUsers.contains(repositoryModel.owner)) {

                     repositoryUsers.add(repositoryModel.owner);

                  }

                  GitBlit.self().setRepositoryUsers(repositoryModel, repositoryUsers);



                  // save the team access list

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

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

                  while (teams.hasNext()) {

                     repositoryTeams.add(teams.next());

                  }

                  GitBlit.self().setRepositoryTeams(repositoryModel, repositoryTeams);

                  GitBlit.self().setUserAccessPermissions(repositoryModel, repositoryUsers);

                  GitBlit.self().setTeamAccessPermissions(repositoryModel, repositoryTeams);

               }

            } catch (GitBlitException e) {

               error(e.getMessage());

@@ -406,7 +388,7 @@
      form.add(new DropDownChoice<FederationStrategy>("federationStrategy", federationStrategies,

            new FederationTypeRenderer()));

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

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

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

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

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

@@ -423,6 +405,8 @@
      group.add(allowNamed);

      form.add(group);

            

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



      form.add(usersPalette);

      form.add(teamsPalette);

      form.add(federationSetsPalette);

@@ -474,13 +458,13 @@
            }

            if (isCreate) {

               // Create Repository

               if (!user.canCreate && !user.canAdmin) {

               if (!user.canCreate() && !user.canAdmin()) {

                  // Only administrators or permitted users may create

                  error(getString("gb.errorOnlyAdminMayCreateRepository"), true);

               }

            } else {

               // Edit Repository

               if (user.canAdmin) {

               if (user.canAdmin()) {

                  // Admins can edit everything

                  isAdmin = true;

                  return;