Stabilizing and polishing permissions ui. Still in-progress.

James Moger

2012-10-29 092f0a62302e87f44403ba24fc519c65534dbfff

 src/com/gitblit/client/EditTeamDialog.java

@@ -45,11 +45,12 @@
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;

import com.gitblit.models.TeamModel;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.StringUtils;



public class EditTeamDialog extends JDialog {

@@ -140,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);

      

@@ -311,9 +312,10 @@
   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);