Renamed method to UserModel.canCreate(String repository)

James Moger

2012-10-22 ec7ac2149ba8603ff1455c948c07037bf6ee030c

 src/com/gitblit/client/EditUserDialog.java

@@ -47,6 +47,7 @@


import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Keys;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.ServerSettings;

import com.gitblit.models.TeamModel;

@@ -80,10 +81,12 @@
   private JCheckBox canAdminCheckbox;

   

   private JCheckBox canForkCheckbox;

	
   private JCheckBox canCreateCheckbox;



   private JCheckBox notFederatedCheckbox;



   private JPalette<String> repositoryPalette;

   private RegistrantPermissionsPanel repositoryPalette;



   private JPalette<TeamModel> teamsPalette;



@@ -128,7 +131,8 @@
      displayNameField = new JTextField(anUser.displayName == null ? "" : anUser.displayName, 25);

      emailAddressField = new JTextField(anUser.emailAddress == null ? "" : anUser.emailAddress, 25);

      canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), anUser.canAdmin);      

      canForkCheckbox = new JCheckBox(Translation.get("gb.canForkDescription"), anUser.canFork);		
      canForkCheckbox = new JCheckBox(Translation.get("gb.canForkDescription"), anUser.canFork);

      canCreateCheckbox = new JCheckBox(Translation.get("gb.canCreateDescription"), anUser.canCreate);

      notFederatedCheckbox = new JCheckBox(

            Translation.get("gb.excludeFromFederationDescription"),

            anUser.excludeFromFederation);

@@ -149,11 +153,12 @@
      fieldsPanel.add(newFieldPanel(Translation.get("gb.emailAddress"), emailAddressField));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.canAdmin"), canAdminCheckbox));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.canFork"), canForkCheckbox));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.canCreate"), canCreateCheckbox));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.excludeFromFederation"),

            notFederatedCheckbox));



      final Insets _insets = new Insets(5, 5, 5, 5);

      repositoryPalette = new JPalette<String>();

      repositoryPalette = new RegistrantPermissionsPanel();

      teamsPalette = new JPalette<TeamModel>();

      teamsPalette.setEnabled(settings.supportsTeamMembershipChanges);



@@ -311,10 +316,12 @@


      user.canAdmin = canAdminCheckbox.isSelected();

      user.canFork = canForkCheckbox.isSelected();

      user.canCreate = canCreateCheckbox.isSelected();

      user.excludeFromFederation = notFederatedCheckbox.isSelected();



      user.repositories.clear();

      user.repositories.addAll(repositoryPalette.getSelections());

      for (RegistrantAccessPermission rp : repositoryPalette.getPermissions()) {

         user.setRepositoryPermission(rp.registrant, rp.permission);

      }



      user.teams.clear();

      user.teams.addAll(teamsPalette.getSelections());

@@ -333,18 +340,20 @@
      }

   }



   public void setRepositories(List<RepositoryModel> repositories, List<String> selected) {

   public void setRepositories(List<RepositoryModel> repositories, List<RegistrantAccessPermission> permissions) {

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

      for (RepositoryModel repo : repositories) {

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

            restricted.add(repo.name);

         }

      }

      StringUtils.sortRepositorynames(restricted);

      if (selected != null) {

         StringUtils.sortRepositorynames(selected);

      // remove repositories for which user already has a permission

      for (RegistrantAccessPermission rp : permissions) {

         restricted.remove(rp.registrant);

      }

      repositoryPalette.setObjects(restricted, selected);

		
      StringUtils.sortRepositorynames(restricted);

      repositoryPalette.setObjects(restricted, permissions);

   }



   public void setTeams(List<TeamModel> teams, List<TeamModel> selected) {