Stabilizing and polishing permissions ui. Still in-progress.

James Moger

2012-10-29 092f0a62302e87f44403ba24fc519c65534dbfff

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

@@ -36,11 +36,10 @@
import org.apache.wicket.model.util.CollectionModel;

import org.apache.wicket.model.util.ListModel;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.TeamModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.RequiresAdminRole;

@@ -62,6 +61,7 @@
      isCreate = true;

      setupPage(new TeamModel(""));

      setStatelessHint(false);

      setOutputMarkupId(true);

   }



   public EditTeamPage(PageParameters params) {

@@ -72,6 +72,7 @@
      TeamModel model = GitBlit.self().getTeamModel(name);

      setupPage(model);

      setStatelessHint(false);

      setOutputMarkupId(true);

   }



   protected void setupPage(final TeamModel teamModel) {

@@ -83,14 +84,7 @@


      CompoundPropertyModel<TeamModel> model = new CompoundPropertyModel<TeamModel>(teamModel);



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

      for (String repo : GitBlit.self().getRepositoryList()) {

         RepositoryModel repositoryModel = GitBlit.self().getRepositoryModel(repo);

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

            repos.add(repo);

         }

      }

      StringUtils.sortRepositorynames(repos);

      List<String> repos = getAccessRestrictedRepositoryList(true, null);



      List<String> teamUsers = new ArrayList<String>(teamModel.users);

      Collections.sort(teamUsers);

@@ -224,7 +218,8 @@
            : StringUtils.flattenStrings(teamModel.mailingLists, " "));

      form.add(new TextField<String>("mailingLists", mailingLists));



      form.add(new RegistrantPermissionsPanel("repositories", repos, permissions, getAccessPermissions()));

      form.add(new RegistrantPermissionsPanel("repositories", RegistrantType.REPOSITORY,

            repos, permissions, getAccessPermissions()));

      form.add(preReceivePalette);

      form.add(new BulletListPanel("inheritedPreReceive", "inherited", GitBlit.self()

            .getPreReceiveScriptsInherited(null)));