James Moger
2013-01-05 9e186eedf1a09ca7ac4fbdea32b00e7e5331f7eb
src/com/gitblit/client/EditTeamDialog.java
@@ -45,6 +45,8 @@
import javax.swing.KeyStroke;
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.AuthorizationControl;
import com.gitblit.Constants.RegistrantType;
import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.ServerSettings;
@@ -139,7 +141,7 @@
      fieldsPanel.add(newFieldPanel(Translation.get("gb.mailingLists"), mailingListsField));
      final Insets _insets = new Insets(5, 5, 5, 5);
      repositoryPalette = new RegistrantPermissionsPanel();
      repositoryPalette = new RegistrantPermissionsPanel(RegistrantType.REPOSITORY);
      userPalette = new JPalette<String>();
      userPalette.setEnabled(settings.supportsTeamMembershipChanges);
      
@@ -310,18 +312,40 @@
   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)) {
         if (repo.accessRestriction.exceeds(AccessRestrictionType.NONE)
               && repo.authorizationControl.equals(AuthorizationControl.NAMED)) {
            restricted.add(repo.name);
         }
      }
      StringUtils.sortRepositorynames(restricted);
      List<String> list = new ArrayList<String>();
      // repositories
      list.add(".*");
      // all repositories excluding personal repositories
      list.add("[^~].*");
      String lastProject = null;
      for (String repo : restricted) {
         String projectPath = StringUtils.getFirstPathElement(repo);
         if (lastProject == null || !lastProject.equalsIgnoreCase(projectPath)) {
            lastProject = projectPath;
            if (!StringUtils.isEmpty(projectPath)) {
               // regex for all repositories within a project
               list.add(projectPath + "/.*");
            }
            list.add(repo);
         }
      }
      // remove repositories for which team already has a permission
      for (RegistrantAccessPermission rp : permissions) {
         restricted.remove(rp.registrant);
      }
      StringUtils.sortRepositorynames(restricted);
      repositoryPalette.setObjects(restricted, permissions);
      // remove repositories for which user already has a permission
      if (permissions == null) {
         permissions = new ArrayList<RegistrantAccessPermission>();
      } else {
         for (RegistrantAccessPermission rp : permissions) {
            list.remove(rp.registrant);
         }
      }
      repositoryPalette.setObjects(list, permissions);
   }
   public void setUsers(List<String> users, List<String> selected) {