Use AccessPolicyPanel in EditRepositoryPage

James Moger

2014-05-31 6a437ec4a6853bdd15f7c33f7fbafdd247a3790c

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

@@ -29,7 +29,6 @@
import org.apache.wicket.PageParameters;

import org.apache.wicket.ajax.AjaxRequestTarget;

import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;

import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;

import org.apache.wicket.behavior.SimpleAttributeModifier;

import org.apache.wicket.extensions.markup.html.form.palette.Palette;

import org.apache.wicket.markup.html.WebMarkupContainer;

@@ -40,7 +39,6 @@
import org.apache.wicket.markup.html.form.DropDownChoice;

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

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

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

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

import org.apache.wicket.markup.html.link.Link;

import org.apache.wicket.markup.html.list.ListItem;

@@ -69,13 +67,19 @@
import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.AccessPolicyPanel;

import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation;

import com.gitblit.wicket.panels.BulletListPanel;

import com.gitblit.wicket.panels.RegistrantPermissionsPanel;

import com.gitblit.wicket.panels.RepositoryNamePanel;



public class EditRepositoryPage extends RootSubPage {



   private final boolean isCreate;



   RepositoryNamePanel namePanel;



   AccessPolicyPanel accessPolicyPanel;



   private boolean isAdmin;



@@ -263,59 +267,8 @@
         @Override

         protected void onSubmit() {

            try {

               // confirm a repository name was entered

               if (repositoryModel.name == null && StringUtils.isEmpty(repositoryModel.name)) {

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

               if (!namePanel.updateModel(repositoryModel)) {

                  return;

               }



               // ensure name is trimmed

               repositoryModel.name = repositoryModel.name.trim();



               // automatically convert backslashes to forward slashes

               repositoryModel.name = repositoryModel.name.replace('\\', '/');

               // Automatically replace // with /

               repositoryModel.name = repositoryModel.name.replace("//", "/");



               // prohibit folder paths

               if (repositoryModel.name.startsWith("/")) {

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

                  return;

               }

               if (repositoryModel.name.startsWith("../")) {

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

                  return;

               }

               if (repositoryModel.name.contains("/../")) {

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

                  return;

               }

               if (repositoryModel.name.endsWith("/")) {

                  repositoryModel.name = repositoryModel.name.substring(0, repositoryModel.name.length() - 1);

               }



               // confirm valid characters in repository name

               Character c = StringUtils.findInvalidCharacter(repositoryModel.name);

               if (c != null) {

                  error(MessageFormat.format(getString("gb.illegalCharacterRepositoryName"),

                        c));

                  return;

               }



               if (user.canCreate() && !user.canAdmin() && allowEditName) {

                  // ensure repository name begins with the user's path

                  if (!repositoryModel.name.startsWith(user.getPersonalPath())) {

                     error(MessageFormat.format(getString("gb.illegalPersonalRepositoryLocation"),

                           user.getPersonalPath()));

                     return;

                  }



                  if (repositoryModel.name.equals(user.getPersonalPath())) {

                     // reset path prefix and show error

                     repositoryModel.name = user.getPersonalPath() + "/";

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

                     return;

                  }

               }



               // confirm access restriction selection

@@ -426,14 +379,11 @@
               }

            } catch (GitBlitException e) {

               error(e.getMessage());

               namePanel.resetModel(repositoryModel);

               return;

            }

            setRedirect(false);

            if (isCreate) {

               setResponsePage(RepositoriesPage.class);

            } else {

               setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryModel.name));

            }

            setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryModel.name));

         }

      };



@@ -441,13 +391,12 @@
      form.add(new SimpleAttributeModifier("autocomplete", "off"));



      // field names reflective match RepositoryModel fields

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

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

      namePanel = new RepositoryNamePanel("namePanel", repositoryModel);

      namePanel.setEditable(allowEditName);

      form.add(namePanel);



      form.add(ownersPalette);

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

      DropDownChoice<AccessRestrictionType> accessRestriction = new DropDownChoice<AccessRestrictionType>("accessRestriction",

            AccessRestrictionType.choices(app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)), new AccessRestrictionRenderer());

      form.add(accessRestriction);

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

      // TODO enable origin definition

      form.add(new TextField<String>("origin").setEnabled(false/* isCreate */));

@@ -505,11 +454,6 @@
      form.add(new TextField<String>("mailingLists", mailingLists));

      form.add(indexedBranchesPalette);



      List<AuthorizationControl> acList = Arrays.asList(AuthorizationControl.values());

      final RadioChoice<AuthorizationControl> authorizationControl = new RadioChoice<Constants.AuthorizationControl>(

            "authorizationControl", acList, new AuthorizationControlRenderer());

      form.add(authorizationControl);



      final CheckBox verifyCommitter = new CheckBox("verifyCommitter");

      verifyCommitter.setOutputMarkupId(true);

      form.add(verifyCommitter);

@@ -533,12 +477,10 @@
         // anonymous everything, disable all controls

         usersPalette.setEnabled(false);

         teamsPalette.setEnabled(false);

         authorizationControl.setEnabled(false);

         verifyCommitter.setEnabled(false);

      } else {

         // authenticated something

         // enable authorization controls

         authorizationControl.setEnabled(true);

         verifyCommitter.setEnabled(true);



         boolean allowFineGrainedControls = repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);

@@ -546,15 +488,15 @@
         teamsPalette.setEnabled(allowFineGrainedControls);

      }



      accessRestriction.add(new AjaxFormComponentUpdatingBehavior("onchange") {

      AjaxFormChoiceComponentUpdatingBehavior callback = new AjaxFormChoiceComponentUpdatingBehavior() {



         private static final long serialVersionUID = 1L;



         @Override

         protected void onUpdate(AjaxRequestTarget target) {

            // enable/disable permissions panel based on access restriction

            accessPolicyPanel.updateModel(repositoryModel);



            boolean allowAuthorizationControl = repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE);

            authorizationControl.setEnabled(allowAuthorizationControl);

            verifyCommitter.setEnabled(allowAuthorizationControl);



            boolean allowFineGrainedControls = allowAuthorizationControl && repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);

@@ -565,36 +507,14 @@
               repositoryModel.authorizationControl = AuthorizationControl.NAMED;

            }



            target.addComponent(authorizationControl);

            target.addComponent(verifyCommitter);

            target.addComponent(usersPalette);

            target.addComponent(teamsPalette);

         }

      });

      };



      authorizationControl.add(new AjaxFormChoiceComponentUpdatingBehavior() {



         private static final long serialVersionUID = 1L;



         @Override

         protected void onUpdate(AjaxRequestTarget target) {

            // enable/disable permissions panel based on access restriction

            boolean allowAuthorizationControl = repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE);

            authorizationControl.setEnabled(allowAuthorizationControl);



            boolean allowFineGrainedControls = allowAuthorizationControl && repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);

            usersPalette.setEnabled(allowFineGrainedControls);

            teamsPalette.setEnabled(allowFineGrainedControls);



            if (allowFineGrainedControls) {

               repositoryModel.authorizationControl = AuthorizationControl.NAMED;

            }



            target.addComponent(authorizationControl);

            target.addComponent(usersPalette);

            target.addComponent(teamsPalette);

         }

      });

      accessPolicyPanel = new AccessPolicyPanel("accessPolicyPanel", repositoryModel, callback);

      form.add(accessPolicyPanel);



      List<CommitMessageRenderer> renderers = Arrays.asList(CommitMessageRenderer.values());

      DropDownChoice<CommitMessageRenderer> messageRendererChoice = new DropDownChoice<CommitMessageRenderer>("commitMessageRenderer", renderers);

@@ -632,7 +552,15 @@
            if (canDelete) {

               if (app().repositories().deleteRepositoryModel(latestModel)) {

                  info(MessageFormat.format(getString("gb.repositoryDeleted"), latestModel));

                  setResponsePage(RepositoriesPage.class);

                  if (latestModel.isPersonalRepository()) {

                     // redirect to user's profile page

                     String prefix = app().settings().getString(Keys.git.userRepositoryPrefix, "~");

                     String username = latestModel.projectPath.substring(prefix.length());

                     setResponsePage(UserPage.class, WicketUtils.newUsernameParameter(username));

                  } else {

                     // redirect to server repositories page

                     setResponsePage(RepositoriesPage.class);

                  }

               } else {

                  error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), latestModel));

               }

@@ -697,27 +625,6 @@
      }

   }



   private class AccessRestrictionRenderer implements IChoiceRenderer<AccessRestrictionType> {



      private static final long serialVersionUID = 1L;



      private final Map<AccessRestrictionType, String> map;



      public AccessRestrictionRenderer() {

         map = getAccessRestrictions();

      }



      @Override

      public String getDisplayValue(AccessRestrictionType type) {

         return map.get(type);

      }



      @Override

      public String getIdValue(AccessRestrictionType type, int index) {

         return Integer.toString(index);

      }

   }



   private class FederationTypeRenderer implements IChoiceRenderer<FederationStrategy> {



      private static final long serialVersionUID = 1L;

@@ -735,27 +642,6 @@


      @Override

      public String getIdValue(FederationStrategy type, int index) {

         return Integer.toString(index);

      }

   }



   private class AuthorizationControlRenderer implements IChoiceRenderer<AuthorizationControl> {



      private static final long serialVersionUID = 1L;



      private final Map<AuthorizationControl, String> map;



      public AuthorizationControlRenderer() {

         map = getAuthorizationControls();

      }



      @Override

      public String getDisplayValue(AuthorizationControl type) {

         return map.get(type);

      }



      @Override

      public String getIdValue(AuthorizationControl type, int index) {

         return Integer.toString(index);

      }

   }