fixed build to allow builds where a proxy is needed for access to outside r...

Jason Pyeron

2012-08-19 d1231c63669f4bc3643985b9032de7f998612e08

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

@@ -27,7 +27,6 @@
import org.apache.wicket.behavior.SimpleAttributeModifier;

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

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

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

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

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

import org.apache.wicket.model.CompoundPropertyModel;

@@ -43,6 +42,7 @@
import com.gitblit.models.TeamModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.BulletListPanel;



@@ -97,12 +97,12 @@
      // 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);

            new CollectionModel<String>(repos), new StringChoiceRenderer(), 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);

            .getAllUsernames()), new StringChoiceRenderer(), 10, false);



      // pre-receive palette

      if (teamModel.preReceiveScripts != null) {

@@ -110,8 +110,8 @@
      }

      final Palette<String> preReceivePalette = new Palette<String>("preReceiveScripts",

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

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

                  ""), 12, true);

                  .self().getPreReceiveScriptsUnused(null)), new StringChoiceRenderer(),

                  12, true);



      // post-receive palette

      if (teamModel.postReceiveScripts != null) {

@@ -119,8 +119,8 @@
      }

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

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

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

                  ""), 12, true);

                  .self().getPostReceiveScriptsUnused(null)), new StringChoiceRenderer(),

                        12, true);



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



@@ -135,13 +135,13 @@
         protected void onSubmit() {

            String teamname = teamModel.name;

            if (StringUtils.isEmpty(teamname)) {

               error("Please enter a teamname!");

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

               return;

            }

            if (isCreate) {

               TeamModel model = GitBlit.self().getTeamModel(teamname);

               if (model != null) {

                  error(MessageFormat.format("Team name ''{0}'' is unavailable.", teamname));

                  error(MessageFormat.format(getString("gb.teamNameUnavailable"), teamname));

                  return;

               }

            }

@@ -149,6 +149,10 @@
            List<String> repos = new ArrayList<String>();

            while (selectedRepositories.hasNext()) {

               repos.add(selectedRepositories.next().toLowerCase());

            }

            if (repos.size() == 0) {

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

               return;

            }

            teamModel.repositories.clear();

            teamModel.repositories.addAll(repos);

@@ -202,22 +206,23 @@
            setRedirect(false);

            if (isCreate) {

               // create another team

               info(MessageFormat.format("New team ''{0}'' successfully created.",

               info(MessageFormat.format(getString("gb.teamCreated"),

                     teamModel.name));

               setResponsePage(EditTeamPage.class);

            } else {

               // back to users page

               setResponsePage(UsersPage.class);

            }

            // back to users page

            setResponsePage(UsersPage.class);

         }

      };



      // do not let the browser pre-populate these fields

      form.add(new SimpleAttributeModifier("autocomplete", "off"));



      // not all user services support manipulating team memberships

      boolean editMemberships = GitBlit.self().supportsTeamMembershipChanges();

		
      // field names reflective match TeamModel fields

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

      form.add(users);

      form.add(users.setEnabled(editMemberships));

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

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

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