Stabilizing and polishing permissions ui. Still in-progress.

James Moger

2012-10-29 092f0a62302e87f44403ba24fc519c65534dbfff

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

@@ -36,16 +36,17 @@
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.models.RepositoryModel;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.TeamModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.BulletListPanel;

import com.gitblit.wicket.panels.RegistrantPermissionsPanel;



@RequiresAdminRole

public class EditTeamPage extends RootSubPage {

@@ -59,6 +60,8 @@
      super();

      isCreate = true;

      setupPage(new TeamModel(""));

      setStatelessHint(false);

      setOutputMarkupId(true);

   }



   public EditTeamPage(PageParameters params) {

@@ -68,6 +71,8 @@
      String name = WicketUtils.getTeamname(params);

      TeamModel model = GitBlit.self().getTeamModel(name);

      setupPage(model);

      setStatelessHint(false);

      setOutputMarkupId(true);

   }



   protected void setupPage(final TeamModel teamModel) {

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

@@ -94,11 +92,7 @@
      List<String> postReceiveScripts = new ArrayList<String>();



      final String oldName = teamModel.name;



      // repositories palette

      final Palette<String> repositories = new Palette<String>("repositories",

            new ListModel<String>(new ArrayList<String>(teamModel.repositories)),

            new CollectionModel<String>(repos), new StringChoiceRenderer(), 10, false);

      final List<RegistrantAccessPermission> permissions = teamModel.getRepositoryPermissions();



      // users palette

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

@@ -146,17 +140,10 @@
                  return;

               }

            }

            Iterator<String> selectedRepositories = repositories.getSelectedChoices();

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

            while (selectedRepositories.hasNext()) {

               repos.add(selectedRepositories.next().toLowerCase());

            // update team permissions

            for (RegistrantAccessPermission repositoryPermission : permissions) {

               teamModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);

            }

            if (repos.size() == 0) {

               error(getString("gb.teamMustSpecifyRepository"));

               return;

            }

            teamModel.repositories.clear();

            teamModel.repositories.addAll(repos);



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

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

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

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



      form.add(repositories);

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

            repos, permissions, getAccessPermissions()));

      form.add(preReceivePalette);

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

            .getPreReceiveScriptsInherited(null)));