Exclude submodules from zip downloads (issue 151)

James Moger

2012-10-18 13417cf9c6eec555b51da49742e47939d2f5715b

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

@@ -21,6 +21,7 @@
import java.util.Collections;

import java.util.HashSet;

import java.util.Iterator;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;

import java.util.Set;

@@ -28,21 +29,28 @@
import org.apache.wicket.PageParameters;

import org.apache.wicket.behavior.SimpleAttributeModifier;

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

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

import org.apache.wicket.markup.html.basic.Label;

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

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

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.Radio;

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

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

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

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

import org.apache.wicket.model.CompoundPropertyModel;

import org.apache.wicket.model.IModel;

import org.apache.wicket.model.Model;

import org.apache.wicket.model.util.CollectionModel;

import org.apache.wicket.model.util.ListModel;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.FederationStrategy;

import com.gitblit.Constants;

import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.AuthorizationControl;

import com.gitblit.Constants.FederationStrategy;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

@@ -67,7 +75,25 @@
      // create constructor

      super();

      isCreate = true;

      setupPage(new RepositoryModel());

      RepositoryModel model = new RepositoryModel();

      String restriction = GitBlit.getString(Keys.git.defaultAccessRestriction, null);

      model.accessRestriction = AccessRestrictionType.fromName(restriction);

      String authorization = GitBlit.getString(Keys.git.defaultAuthorizationControl, null);

      model.authorizationControl = AuthorizationControl.fromName(authorization);

		
      GitBlitWebSession session = GitBlitWebSession.get();

      UserModel user = session.getUser();

      if (user != null && user.canCreate() && !user.canAdmin()) {

         // personal create permissions, inject personal repository path

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

         model.projectPath = user.getPersonalPath();

         model.owner = user.username;

         // personal repositories are private by default

         model.accessRestriction = AccessRestrictionType.VIEW;

         model.authorizationControl = AuthorizationControl.NAMED;

      }

		
      setupPage(model);

   }



   public EditRepositoryPage(PageParameters params) {

@@ -90,8 +116,15 @@
      List<String> preReceiveScripts = new ArrayList<String>();

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



      GitBlitWebSession session = GitBlitWebSession.get();

      final UserModel user = session.getUser() == null ? UserModel.ANONYMOUS : session.getUser();



      if (isCreate) {

         super.setupPage(getString("gb.newRepository"), "");

         if (user.canAdmin()) {

            super.setupPage(getString("gb.newRepository"), "");

         } else {

            super.setupPage(getString("gb.newRepository"), user.getDisplayName());

         }

      } else {

         super.setupPage(getString("gb.edit"), repositoryModel.name);

         if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {

@@ -149,6 +182,28 @@
            new ListModel<String>(postReceiveScripts), new CollectionModel<String>(GitBlit

                  .self().getPostReceiveScriptsUnused(repositoryModel)),

            new StringChoiceRenderer(), 12, true);

		
      // custom fields

      final Map<String, String> customFieldsMap = GitBlit.getMap(Keys.groovy.customFields);

      List<String> customKeys = new ArrayList<String>(customFieldsMap.keySet());

      final ListView<String> customFieldsListView = new ListView<String>("customFieldsListView", customKeys) {

			
         private static final long serialVersionUID = 1L;



         @Override

         protected void populateItem(ListItem<String> item) {

            String key = item.getModelObject();

            item.add(new Label("customFieldLabel", customFieldsMap.get(key)));

				
            String value = "";

            if (repositoryModel.customFields != null && repositoryModel.customFields.containsKey(key)) {

               value = repositoryModel.customFields.get(key);

            }

            TextField<String> field = new TextField<String>("customFieldValue", new Model<String>(value));

            item.add(field);

         }

      };

      customFieldsListView.setReuseItems(true);



      CompoundPropertyModel<RepositoryModel> model = new CompoundPropertyModel<RepositoryModel>(

            repositoryModel);

@@ -160,11 +215,14 @@
         protected void onSubmit() {

            try {

               // confirm a repository name was entered

               if (StringUtils.isEmpty(repositoryModel.name)) {

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

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

                  return;

               }



					
               // ensure name is trimmed

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

					
               // automatically convert backslashes to forward slashes

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

               // Automatically replace // with /

@@ -182,6 +240,9 @@
               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

@@ -190,6 +251,22 @@
                  error(MessageFormat.format(getString("gb.illegalCharacterRepositoryName"),

                        c));

                  return;

               }

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

                  // 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

@@ -249,7 +326,19 @@
                  postReceiveScripts.add(post.next());

               }

               repositoryModel.postReceiveScripts = postReceiveScripts;

					
               // custom fields

               repositoryModel.customFields = new LinkedHashMap<String, String>();

               for (int i = 0; i < customFieldsListView.size(); i++) {

                  ListItem<String> child = (ListItem<String>) customFieldsListView.get(i);

                  String key = child.getModelObject();



                  TextField<String> field = (TextField<String>) child.get("customFieldValue");

                  String value = field.getValue();

						
                  repositoryModel.customFields.put(key, value);

               }

					
               // save the repository

               GitBlit.self().updateRepositoryModel(oldName, repositoryModel, isCreate);



@@ -289,10 +378,11 @@
      form.add(new SimpleAttributeModifier("autocomplete", "off"));



      // field names reflective match RepositoryModel fields

      form.add(new TextField<String>("name").setEnabled(isCreate || isAdmin));

      form.add(new TextField<String>("name").setEnabled(isCreate || isAdmin || repositoryModel.isUsersPersonalRepository(user.username)));

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

      form.add(new DropDownChoice<String>("owner", GitBlit.self().getAllUsernames())

            .setEnabled(GitBlitWebSession.get().canAdmin()));

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

      form.add(new DropDownChoice<AccessRestrictionType>("accessRestriction", Arrays

            .asList(AccessRestrictionType.values()), new AccessRestrictionRenderer()));

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

@@ -316,7 +406,7 @@
      form.add(new DropDownChoice<FederationStrategy>("federationStrategy", federationStrategies,

            new FederationTypeRenderer()));

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

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

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

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

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

@@ -325,18 +415,32 @@
            : StringUtils.flattenStrings(repositoryModel.mailingLists, " "));

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

      form.add(indexedBranchesPalette);

		
      RadioGroup<AuthorizationControl> group = new RadioGroup<AuthorizationControl>("authorizationControl");

      Radio<AuthorizationControl> allowAuthenticated = new Radio<AuthorizationControl>("allowAuthenticated", new Model<AuthorizationControl>(AuthorizationControl.AUTHENTICATED));		
      Radio<AuthorizationControl> allowNamed = new Radio<AuthorizationControl>("allowNamed", new Model<AuthorizationControl>(AuthorizationControl.NAMED));

      group.add(allowAuthenticated);

      group.add(allowNamed);

      form.add(group);

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



      form.add(usersPalette);

      form.add(teamsPalette);

      form.add(federationSetsPalette);

      form.add(preReceivePalette);

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

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

            .getPreReceiveScriptsInherited(repositoryModel)));

      form.add(postReceivePalette);

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

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

            .getPostReceiveScriptsInherited(repositoryModel)));

		
      WebMarkupContainer customFieldsSection = new WebMarkupContainer("customFieldsSection");

      customFieldsSection.add(customFieldsListView);

      form.add(customFieldsSection.setVisible(!GitBlit.getString(Keys.groovy.customFields, "").isEmpty()));



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

      Button cancel = new Button(getString("gb.cancel")) {

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

      Button cancel = new Button("cancel") {

         private static final long serialVersionUID = 1L;



         @Override

@@ -368,31 +472,31 @@
         if (authenticateAdmin) {

            if (user == null) {

               // No Login Available

               error("Administration requires a login", true);

               error(getString("gb.errorAdminLoginRequired"), true);

            }

            if (isCreate) {

               // Create Repository

               if (!user.canAdmin) {

                  // Only Administrators May Create

                  error("Only an administrator may create a repository", true);

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

                  // Only administrators or permitted users may create

                  error(getString("gb.errorOnlyAdminMayCreateRepository"), true);

               }

            } else {

               // Edit Repository

               if (user.canAdmin) {

               if (user.canAdmin()) {

                  // Admins can edit everything

                  isAdmin = true;

                  return;

               } else {

                  if (!model.owner.equalsIgnoreCase(user.username)) {

                     // User is not an Admin nor Owner

                     error("Only an administrator or the owner may edit a repository", true);

                     error(getString("gb.errorOnlyAdminOrOwnerMayEditRepository"), true);

                  }

               }

            }

         }

      } else {

         // No Administration Permitted

         error("Administration is disabled", true);

         error(getString("gb.errorAdministrationDisabled"), true);

      }

   }