Merge pull request #1045 from gitblit/882-HonourAllowNewTicketSetting

Paul Martin

2016-04-06 018ad3913231e1aa53a60a00db40d5fea7ceb279

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

@@ -46,6 +46,7 @@
import org.apache.wicket.model.CompoundPropertyModel;

import org.apache.wicket.model.IModel;

import org.apache.wicket.model.Model;

import org.apache.wicket.model.PropertyModel;

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

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

import org.eclipse.jgit.lib.Repository;

@@ -69,9 +70,12 @@
import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.AccessPolicyPanel;

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

import com.gitblit.wicket.panels.BooleanOption;

import com.gitblit.wicket.panels.BulletListPanel;

import com.gitblit.wicket.panels.ChoiceOption;

import com.gitblit.wicket.panels.RegistrantPermissionsPanel;

import com.gitblit.wicket.panels.RepositoryNamePanel;

import com.gitblit.wicket.panels.TextOption;



public class EditRepositoryPage extends RootSubPage {



@@ -182,15 +186,18 @@


      // owners palette

      List<UserChoice> owners = new ArrayList<UserChoice>();

      List<UserChoice> persons = new ArrayList<UserChoice>();

      for (String owner : repositoryModel.owners) {

         UserModel o = app().users().getUserModel(owner);

         if (o != null) {

            owners.add(new UserChoice(o.getDisplayName(), o.username, o.emailAddress));

         } else {

            owners.add(new UserChoice(owner));

            UserChoice userChoice = new UserChoice(owner);

            owners.add(userChoice);

            persons.add(userChoice);

         }

      }

      List<UserChoice> persons = new ArrayList<UserChoice>();



      for (String person : app().users().getAllUsernames()) {

         UserModel o = app().users().getUserModel(person);

         if (o != null) {

@@ -200,7 +207,7 @@
         }

      }

      final Palette<UserChoice> ownersPalette = new Palette<UserChoice>("owners", new ListModel<UserChoice>(owners), new CollectionModel<UserChoice>(

            persons), new ChoiceRenderer<UserChoice>(null, "userId"), 12, true);

            persons), new ChoiceRenderer<UserChoice>(null, "userId"), 12, false);



      // indexed local branches palette

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

@@ -379,7 +386,6 @@
               }

            } catch (GitBlitException e) {

               error(e.getMessage());

               namePanel.resetModel(repositoryModel);

               return;

            }

            setRedirect(false);

@@ -387,21 +393,7 @@
         }

      };



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

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



      // field names reflective match RepositoryModel fields

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

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

      // TODO enable origin definition

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



      // allow relinking HEAD to a branch or tag other than master on edit repository

      // Determine available refs & branches

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

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

      if (!ArrayUtils.isEmpty(repositoryModel.availableRefs)) {

@@ -414,53 +406,79 @@
            }

         }

      }

      form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(availableRefs.size() > 0));



      boolean gcEnabled = app().settings().getBoolean(Keys.git.enableGarbageCollection, false);

      int defaultGcPeriod = app().settings().getInteger(Keys.git.defaultGarbageCollectionPeriod, 7);

      if (repositoryModel.gcPeriod == 0) {

         repositoryModel.gcPeriod = defaultGcPeriod;

      }

      List<Integer> gcPeriods = Arrays.asList(1, 2, 3, 4, 5, 7, 10, 14 );

      form.add(new DropDownChoice<Integer>("gcPeriod", gcPeriods, new GCPeriodRenderer()).setEnabled(gcEnabled));

      form.add(new TextField<String>("gcThreshold").setEnabled(gcEnabled));

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

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



      // federation strategies - remove ORIGIN choice if this repository has

      // no origin.

      List<FederationStrategy> federationStrategies = new ArrayList<FederationStrategy>(

            Arrays.asList(FederationStrategy.values()));

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

         federationStrategies.remove(FederationStrategy.FEDERATE_ORIGIN);

      }

      form.add(new DropDownChoice<FederationStrategy>("federationStrategy", federationStrategies,

            new FederationTypeRenderer()));

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

      form.add(new CheckBox("acceptNewTickets"));
      form.add(new CheckBox("requireApproval"));

      form.add(new DropDownChoice<String>("mergeTo", availableBranches).setEnabled(availableBranches.size() > 0));

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

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

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

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

      List<Integer> maxActivityCommits  = Arrays.asList(-1, 0, 25, 50, 75, 100, 150, 200, 250, 500);

      form.add(new DropDownChoice<Integer>("maxActivityCommits", maxActivityCommits, new MaxActivityCommitsRenderer()));



      metricAuthorExclusions = new Model<String>(ArrayUtils.isEmpty(repositoryModel.metricAuthorExclusions) ? ""

            : StringUtils.flattenStrings(repositoryModel.metricAuthorExclusions, " "));

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

      //

      //

      // GENERAL

      //

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

      namePanel.setEditable(allowEditName);

      form.add(namePanel);



      mailingLists = new Model<String>(ArrayUtils.isEmpty(repositoryModel.mailingLists) ? ""

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

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

      form.add(indexedBranchesPalette);

      // XXX AccessPolicyPanel is defined later.



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

      verifyCommitter.setOutputMarkupId(true);

      form.add(verifyCommitter);

      form.add(new ChoiceOption<String>("head",

            getString("gb.headRef"),

            getString("gb.headRefDescription"),

            new PropertyModel<String>(repositoryModel, "HEAD"),

            availableRefs));





      //

      // PERMISSIONS

      //

      form.add(ownersPalette);

      form.add(usersPalette);

      form.add(teamsPalette);

      form.add(federationSetsPalette);



      //

      // TICKETS

      //

      form.add(new BooleanOption("acceptNewPatchsets",

            getString("gb.acceptNewPatchsets"),

            getString("gb.acceptNewPatchsetsDescription"),

            new PropertyModel<Boolean>(repositoryModel, "acceptNewPatchsets")));



      form.add(new BooleanOption("acceptNewTickets",

            getString("gb.acceptNewTickets"),

            getString("gb.acceptNewTicketsDescription"),

            new PropertyModel<Boolean>(repositoryModel, "acceptNewTickets")));



      form.add(new BooleanOption("requireApproval",

            getString("gb.requireApproval"),

            getString("gb.requireApprovalDescription"),

            new PropertyModel<Boolean>(repositoryModel, "requireApproval")));



      form.add(new ChoiceOption<String>("mergeTo",

            getString("gb.mergeTo"),

            getString("gb.mergeToDescription"),

            new PropertyModel<String>(repositoryModel, "mergeTo"),

            availableBranches));



      //

      // RECEIVE

      //

      form.add(new BooleanOption("isFrozen",

            getString("gb.isFrozen"),

            getString("gb.isFrozenDescription"),

            new PropertyModel<Boolean>(repositoryModel, "isFrozen")));



      form.add(new BooleanOption("incrementalPushTags",

            getString("gb.enableIncrementalPushTags"),

            getString("gb.useIncrementalPushTagsDescription"),

            new PropertyModel<Boolean>(repositoryModel, "useIncrementalPushTags")));



      final CheckBox verifyCommitter = new CheckBox("checkbox", new PropertyModel<Boolean>(repositoryModel, "verifyCommitter"));

      verifyCommitter.setOutputMarkupId(true);

      form.add(new BooleanOption("verifyCommitter",

            getString("gb.verifyCommitter"),

            getString("gb.verifyCommitterDescription") + "<br/>" + getString("gb.verifyCommitterNote"),

            verifyCommitter).setIsHtmlDescription(true));



      form.add(preReceivePalette);

      form.add(new BulletListPanel("inheritedPreReceive", getString("gb.inherited"), app().repositories()

            .getPreReceiveScriptsInherited(repositoryModel)));

@@ -471,6 +489,116 @@
      WebMarkupContainer customFieldsSection = new WebMarkupContainer("customFieldsSection");

      customFieldsSection.add(customFieldsListView);

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



      //

      // FEDERATION

      //

      List<FederationStrategy> federationStrategies = new ArrayList<FederationStrategy>(

            Arrays.asList(FederationStrategy.values()));

      // federation strategies - remove ORIGIN choice if this repository has no origin.

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

         federationStrategies.remove(FederationStrategy.FEDERATE_ORIGIN);

      }



      form.add(new ChoiceOption<FederationStrategy>("federationStrategy",

            getString("gb.federationStrategy"),

            getString("gb.federationStrategyDescription"),

            new DropDownChoice<FederationStrategy>(

                  "choice",

                  new PropertyModel<FederationStrategy>(repositoryModel, "federationStrategy"),

                  federationStrategies,

                  new FederationTypeRenderer())));



      form.add(federationSetsPalette);



      //

      // SEARCH

      //

      form.add(indexedBranchesPalette);



      //

      // GARBAGE COLLECTION

      //

      boolean gcEnabled = app().settings().getBoolean(Keys.git.enableGarbageCollection, false);

      int defaultGcPeriod = app().settings().getInteger(Keys.git.defaultGarbageCollectionPeriod, 7);

      if (repositoryModel.gcPeriod == 0) {

         repositoryModel.gcPeriod = defaultGcPeriod;

      }

      List<Integer> gcPeriods = Arrays.asList(1, 2, 3, 4, 5, 7, 10, 14 );

      form.add(new ChoiceOption<Integer>("gcPeriod",

            getString("gb.gcPeriod"),

            getString("gb.gcPeriodDescription"),

            new DropDownChoice<Integer>("choice",

                  new PropertyModel<Integer>(repositoryModel, "gcPeriod"),

                  gcPeriods,

                  new GCPeriodRenderer())).setEnabled(gcEnabled));



      form.add(new TextOption("gcThreshold",

            getString("gb.gcThreshold"),

            getString("gb.gcThresholdDescription"),

            "span1",

            new PropertyModel<String>(repositoryModel, "gcThreshold")).setEnabled(gcEnabled));



      //

      // MISCELLANEOUS

      //



      form.add(new TextOption("origin",

            getString("gb.origin"),

            getString("gb.originDescription"),

            "span6",

            new PropertyModel<String>(repositoryModel, "origin")).setEnabled(false));



      form.add(new BooleanOption("showRemoteBranches",

            getString("gb.showRemoteBranches"),

            getString("gb.showRemoteBranchesDescription"),

            new PropertyModel<Boolean>(repositoryModel, "showRemoteBranches")));



      form.add(new BooleanOption("skipSizeCalculation",

            getString("gb.skipSizeCalculation"),

            getString("gb.skipSizeCalculationDescription"),

            new PropertyModel<Boolean>(repositoryModel, "skipSizeCalculation")));



      form.add(new BooleanOption("skipSummaryMetrics",

            getString("gb.skipSummaryMetrics"),

            getString("gb.skipSummaryMetricsDescription"),

            new PropertyModel<Boolean>(repositoryModel, "skipSummaryMetrics")));



      List<Integer> maxActivityCommits  = Arrays.asList(-1, 0, 25, 50, 75, 100, 150, 200, 250, 500);

      form.add(new ChoiceOption<Integer>("maxActivityCommits",

            getString("gb.maxActivityCommits"),

            getString("gb.maxActivityCommitsDescription"),

            new DropDownChoice<Integer>("choice",

                  new PropertyModel<Integer>(repositoryModel, "maxActivityCommits"),

                  maxActivityCommits,

                  new MaxActivityCommitsRenderer())));



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

      form.add(new ChoiceOption<CommitMessageRenderer>("commitMessageRenderer",

            getString("gb.commitMessageRenderer"),

            getString("gb.commitMessageRendererDescription"),

            new DropDownChoice<CommitMessageRenderer>("choice",

                  new PropertyModel<CommitMessageRenderer>(repositoryModel, "commitMessageRenderer"),

                  renderers)));



      metricAuthorExclusions = new Model<String>(ArrayUtils.isEmpty(repositoryModel.metricAuthorExclusions) ? ""

            : StringUtils.flattenStrings(repositoryModel.metricAuthorExclusions, " "));



      form.add(new TextOption("metricAuthorExclusions",

            getString("gb.metricAuthorExclusions"),

            getString("gb.metricAuthorExclusions"),

            "span6",

            metricAuthorExclusions));



      mailingLists = new Model<String>(ArrayUtils.isEmpty(repositoryModel.mailingLists) ? ""

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



      form.add(new TextOption("mailingLists",

            getString("gb.mailingLists"),

            getString("gb.mailingLists"),

            "span6",

            mailingLists));





      // initial enable/disable of permission controls

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

@@ -488,6 +616,9 @@
         teamsPalette.setEnabled(allowFineGrainedControls);

      }



      //

      // ACCESS POLICY PANEL (GENERAL)

      //

      AjaxFormChoiceComponentUpdatingBehavior callback = new AjaxFormChoiceComponentUpdatingBehavior() {



         private static final long serialVersionUID = 1L;

@@ -516,10 +647,10 @@
      accessPolicyPanel = new AccessPolicyPanel("accessPolicyPanel", repositoryModel, callback);

      form.add(accessPolicyPanel);



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

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

      form.add(messageRendererChoice);



      //

      // FORM CONTROLS

      //

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

      Button cancel = new Button("cancel") {

         private static final long serialVersionUID = 1L;

@@ -550,7 +681,7 @@
            RepositoryModel latestModel = app().repositories().getRepositoryModel(repositoryModel.name);

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

            if (canDelete) {

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

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

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

                  if (latestModel.isPersonalRepository()) {

                     // redirect to user's profile page

@@ -625,6 +756,7 @@
      }

   }





   private class FederationTypeRenderer implements IChoiceRenderer<FederationStrategy> {



      private static final long serialVersionUID = 1L;