Fixed bug in receive hook for repositories in subfolders

James Moger

2012-01-05 cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef

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

@@ -18,8 +18,10 @@
import java.text.MessageFormat;

import java.util.ArrayList;

import java.util.Collections;

import java.util.HashSet;

import java.util.Iterator;

import java.util.List;

import java.util.Set;



import org.apache.wicket.PageParameters;

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

@@ -28,6 +30,8 @@
import org.apache.wicket.markup.html.form.Form;

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

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;



@@ -39,11 +43,14 @@
import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.BulletListPanel;



@RequiresAdminRole

public class EditTeamPage extends RootSubPage {



   private final boolean isCreate;



   private IModel<String> mailingLists;



   public EditTeamPage() {

      // create constructor

@@ -67,7 +74,7 @@
      } else {

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

      }

		


      CompoundPropertyModel<TeamModel> model = new CompoundPropertyModel<TeamModel>(teamModel);



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

@@ -78,17 +85,42 @@
         }

      }

      StringUtils.sortRepositorynames(repos);

		


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

      Collections.sort(teamUsers);

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

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



      final String oldName = teamModel.name;



      // repositories palette

      final Palette<String> repositories = new Palette<String>("repositories",

            new ListModel<String>(new ArrayList<String>(teamModel.repositories)),

            new CollectionModel<String>(repos), new ChoiceRenderer<String>("", ""), 10, false);



      // users palette

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

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

            .getAllUsernames()), new ChoiceRenderer<String>("", ""), 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 ChoiceRenderer<String>("",

                  ""), 12, true);



      // post-receive palette

      if (teamModel.postReceiveScripts != null) {

         postReceiveScripts.addAll(teamModel.postReceiveScripts);

      }

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

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

                  .self().getPostReceiveScriptsUnused(null)), new ChoiceRenderer<String>("",

                  ""), 12, true);



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



         private static final long serialVersionUID = 1L;

@@ -128,6 +160,38 @@
            teamModel.users.clear();

            teamModel.users.addAll(members);



            // set mailing lists

            String ml = mailingLists.getObject();

            if (!StringUtils.isEmpty(ml)) {

               Set<String> list = new HashSet<String>();

               for (String address : ml.split("(,|\\s)")) {

                  if (StringUtils.isEmpty(address)) {

                     continue;

                  }

                  list.add(address.toLowerCase());

               }

               teamModel.mailingLists.clear();

               teamModel.mailingLists.addAll(list);

            }



            // pre-receive scripts

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

            Iterator<String> pres = preReceivePalette.getSelectedChoices();

            while (pres.hasNext()) {

               preReceiveScripts.add(pres.next());

            }

            teamModel.preReceiveScripts.clear();

            teamModel.preReceiveScripts.addAll(preReceiveScripts);



            // post-receive scripts

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

            Iterator<String> post = postReceivePalette.getSelectedChoices();

            while (post.hasNext()) {

               postReceiveScripts.add(post.next());

            }

            teamModel.postReceiveScripts.clear();

            teamModel.postReceiveScripts.addAll(postReceiveScripts);



            try {

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

            } catch (GitBlitException e) {

@@ -149,8 +213,18 @@


      // field names reflective match TeamModel fields

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

      form.add(repositories);

      form.add(users);

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

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

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



      form.add(repositories);

      form.add(preReceivePalette);

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

            .getPreReceiveScriptsInherited(null)));

      form.add(postReceivePalette);

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

            .getPostReceiveScriptsInherited(null)));



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

      Button cancel = new Button("cancel") {