Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

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

@@ -18,6 +18,7 @@
import java.text.MessageFormat;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;

import java.util.HashSet;

import java.util.Iterator;

import java.util.List;

@@ -28,6 +29,7 @@
import org.apache.wicket.extensions.markup.html.form.palette.Palette;

import org.apache.wicket.markup.html.form.Button;

import org.apache.wicket.markup.html.form.CheckBox;

import org.apache.wicket.markup.html.form.ChoiceRenderer;

import org.apache.wicket.markup.html.form.Form;

import org.apache.wicket.markup.html.form.TextField;

import org.apache.wicket.model.CompoundPropertyModel;

@@ -37,11 +39,13 @@
import org.apache.wicket.model.util.ListModel;



import com.gitblit.Constants.RegistrantType;

import com.gitblit.GitBlit;

import com.gitblit.Constants.Role;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.TeamModel;

import com.gitblit.models.UserChoice;

import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.StringChoiceRenderer;

@@ -70,7 +74,7 @@
      super(params);

      isCreate = false;

      String name = WicketUtils.getTeamname(params);

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

      TeamModel model = app().users().getTeamModel(name);

      setupPage(model);

      setStatelessHint(false);

      setOutputMarkupId(true);

@@ -80,10 +84,10 @@
   protected boolean requiresPageMap() {

      return true;

   }

	


   @Override

   protected Class<? extends BasePage> getRootNavPageClass() {

      return UsersPage.class;

      return TeamsPage.class;

   }



   protected void setupPage(final TeamModel teamModel) {

@@ -98,7 +102,6 @@
      List<String> repos = getAccessRestrictedRepositoryList(true, null);



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

      Collections.sort(teamUsers);

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

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



@@ -106,17 +109,16 @@
      final List<RegistrantAccessPermission> permissions = teamModel.getRepositoryPermissions();



      // users palette

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

            new ArrayList<String>(teamUsers)), new CollectionModel<String>(GitBlit.self()

            .getAllUsernames()), new StringChoiceRenderer(), 10, false);

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

            getTeamUsers(teamUsers)), new CollectionModel<UserChoice>(sortByDisplayName(getTeamUsers(app().users().getAllUsernames()))), new ChoiceRenderer<UserChoice>(null, "userId"), 10, false);



      // pre-receive palette

      if (teamModel.preReceiveScripts != null) {

         preReceiveScripts.addAll(teamModel.preReceiveScripts);

      }

      final Palette<String> preReceivePalette = new Palette<String>("preReceiveScripts",

            new ListModel<String>(preReceiveScripts), new CollectionModel<String>(GitBlit

                  .self().getPreReceiveScriptsUnused(null)), new StringChoiceRenderer(),

            new ListModel<String>(preReceiveScripts), new CollectionModel<String>(app().repositories()

                  .getPreReceiveScriptsUnused(null)), new StringChoiceRenderer(),

                  12, true);



      // post-receive palette

@@ -124,8 +126,8 @@
         postReceiveScripts.addAll(teamModel.postReceiveScripts);

      }

      final Palette<String> postReceivePalette = new Palette<String>("postReceiveScripts",

            new ListModel<String>(postReceiveScripts), new CollectionModel<String>(GitBlit

                  .self().getPostReceiveScriptsUnused(null)), new StringChoiceRenderer(),

            new ListModel<String>(postReceiveScripts), new CollectionModel<String>(app().repositories()

                  .getPostReceiveScriptsUnused(null)), new StringChoiceRenderer(),

                        12, true);



      Form<TeamModel> form = new Form<TeamModel>("editForm", model) {

@@ -134,7 +136,7 @@


         /*

          * (non-Javadoc)

          * 
          *

          * @see org.apache.wicket.markup.html.form.Form#onSubmit()

          */

         @Override

@@ -145,7 +147,7 @@
               return;

            }

            if (isCreate) {

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

               TeamModel model = app().users().getTeamModel(teamname);

               if (model != null) {

                  error(MessageFormat.format(getString("gb.teamNameUnavailable"), teamname));

                  return;

@@ -156,10 +158,10 @@
               teamModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);

            }



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

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

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

            while (selectedUsers.hasNext()) {

               members.add(selectedUsers.next().toLowerCase());

               members.add(selectedUsers.next().getUserId().toLowerCase());

            }

            teamModel.users.clear();

            teamModel.users.addAll(members);

@@ -197,7 +199,11 @@
            teamModel.postReceiveScripts.addAll(postReceiveScripts);



            try {

               GitBlit.self().updateTeamModel(oldName, teamModel, isCreate);

               if (isCreate) {

                  app().gitblit().addTeam(teamModel);

               } else {

                  app().gitblit().reviseTeam(oldName, teamModel);

               }

            } catch (GitBlitException e) {

               error(e.getMessage());

               return;

@@ -209,21 +215,30 @@
                     teamModel.name));

            }

            // back to users page

            setResponsePage(UsersPage.class);

            setResponsePage(TeamsPage.class);

         }

      };



      // do not let the browser pre-populate these fields

      form.add(new SimpleAttributeModifier("autocomplete", "off"));



      // not all user services support manipulating team memberships

      boolean editMemberships = GitBlit.self().supportsTeamMembershipChanges(null);

		
      // not all user providers support manipulating team memberships

      boolean editMemberships = app().authentication().supportsTeamMembershipChanges(teamModel);



      // not all user providers support manipulating the admin role

      boolean changeAdminRole = app().authentication().supportsRoleChanges(teamModel, Role.ADMIN);



      // not all user providers support manipulating the create role

      boolean changeCreateRole = app().authentication().supportsRoleChanges(teamModel, Role.CREATE);



      // not all user providers support manipulating the fork role

      boolean changeForkRole = app().authentication().supportsRoleChanges(teamModel, Role.FORK);



      // field names reflective match TeamModel fields

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

      form.add(new CheckBox("canAdmin"));

      form.add(new CheckBox("canFork").setEnabled(GitBlit.getBoolean(Keys.web.allowForking, true)));

      form.add(new CheckBox("canCreate"));

      form.add(new CheckBox("canAdmin").setEnabled(changeAdminRole));

      form.add(new CheckBox("canFork").setEnabled(app().settings().getBoolean(Keys.web.allowForking, true) && changeForkRole));

      form.add(new CheckBox("canCreate").setEnabled(changeCreateRole));

      form.add(users.setEnabled(editMemberships));

      mailingLists = new Model<String>(teamModel.mailingLists == null ? ""

            : StringUtils.flattenStrings(teamModel.mailingLists, " "));

@@ -232,10 +247,10 @@
      form.add(new RegistrantPermissionsPanel("repositories", RegistrantType.REPOSITORY,

            repos, permissions, getAccessPermissions()));

      form.add(preReceivePalette);

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

      form.add(new BulletListPanel("inheritedPreReceive", "inherited", app().repositories()

            .getPreReceiveScriptsInherited(null)));

      form.add(postReceivePalette);

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

      form.add(new BulletListPanel("inheritedPostReceive", "inherited", app().repositories()

            .getPostReceiveScriptsInherited(null)));



      form.add(new Button("save"));

@@ -244,7 +259,7 @@


         @Override

         public void onSubmit() {

            setResponsePage(UsersPage.class);

            setResponsePage(TeamsPage.class);

         }

      };

      cancel.setDefaultFormProcessing(false);

@@ -252,4 +267,26 @@


      add(form);

   }



   private List<UserChoice> getTeamUsers(List<String> teamUserIds) {

      List<UserChoice> teamUsers = new ArrayList<UserChoice>();

      for (String teamUserId : teamUserIds) {

         UserModel userModel = app().users().getUserModel(teamUserId);

         if (userModel!=null) {

            teamUsers.add(new UserChoice(userModel.displayName, userModel.username, userModel.emailAddress));

         }

      }

      return sortByDisplayName(teamUsers);

   }



   private List<UserChoice> sortByDisplayName(List<UserChoice> teamUsers) {

      Collections.sort(teamUsers, new Comparator<UserChoice>() {



         @Override

         public int compare(UserChoice o1, UserChoice o2) {

            return o1.getDisplayNameOrUserId().compareTo(o2.getDisplayNameOrUserId());

         }

      });

      return teamUsers;

   }

}