Use RepositoryNamePanel in EditRepositoryPage, rename AccessPolicyPanel

James Moger

2014-05-30 5779988cf3a1d737322b2b6a1d568da8713509e7

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

@@ -42,6 +42,7 @@
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;

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

import org.apache.wicket.model.CompoundPropertyModel;

@@ -68,12 +69,16 @@
import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

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;



   private boolean isAdmin;



@@ -261,59 +266,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

@@ -424,14 +378,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));

         }

      };



@@ -439,8 +390,10 @@
      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",

@@ -614,6 +567,46 @@
      cancel.setDefaultFormProcessing(false);

      form.add(cancel);



      // the user can delete if deletions are allowed AND the user is an admin or the personal owner

      // assigned ownership is not sufficient to allow deletion

      boolean canDelete = !isCreate && app().repositories().canDelete(repositoryModel)

            && (user.canAdmin() || user.isMyPersonalRepository(repositoryModel.name));



      Link<Void> delete = new Link<Void>("delete") {



         private static final long serialVersionUID = 1L;



         @Override

         public void onClick() {

            RepositoryModel latestModel = app().repositories().getRepositoryModel(repositoryModel.name);

            boolean canDelete = app().repositories().canDelete(latestModel);

            if (canDelete) {

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

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

                  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));

               }

            } else {

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

            }

         }

      };



      if (canDelete) {

         delete.add(new JavascriptEventConfirmation("onclick", MessageFormat.format(

            getString("gb.deleteRepository"), repositoryModel)));

      }

      form.add(delete.setVisible(canDelete));



      add(form);

   }