Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

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

@@ -39,6 +39,7 @@
import org.apache.wicket.model.util.ListModel;



import com.gitblit.Constants.RegistrantType;

import com.gitblit.Constants.Role;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.RegistrantAccessPermission;

@@ -86,7 +87,7 @@


   @Override

   protected Class<? extends BasePage> getRootNavPageClass() {

      return UsersPage.class;

      return TeamsPage.class;

   }



   protected void setupPage(final TeamModel teamModel) {

@@ -214,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

      // 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(app().settings().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, " "));

@@ -249,7 +259,7 @@


         @Override

         public void onSubmit() {

            setResponsePage(UsersPage.class);

            setResponsePage(TeamsPage.class);

         }

      };

      cancel.setDefaultFormProcessing(false);