Merge pull request #1045 from gitblit/882-HonourAllowNewTicketSetting

Paul Martin

2016-04-06 018ad3913231e1aa53a60a00db40d5fea7ceb279

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

@@ -70,8 +70,8 @@
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.CheckboxOption;

import com.gitblit.wicket.panels.ChoiceOption;

import com.gitblit.wicket.panels.RegistrantPermissionsPanel;

import com.gitblit.wicket.panels.RepositoryNamePanel;

@@ -186,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) {

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

            } catch (GitBlitException e) {

               error(e.getMessage());

               namePanel.resetModel(repositoryModel);

               return;

            }

            setRedirect(false);

@@ -436,17 +438,17 @@
      //

      // TICKETS

      //

      form.add(new CheckboxOption("acceptNewPatchsets",

      form.add(new BooleanOption("acceptNewPatchsets",

            getString("gb.acceptNewPatchsets"),

            getString("gb.acceptNewPatchsetsDescription"),

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



      form.add(new CheckboxOption("acceptNewTickets",

      form.add(new BooleanOption("acceptNewTickets",

            getString("gb.acceptNewTickets"),

            getString("gb.acceptNewTicketsDescription"),

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

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



      form.add(new CheckboxOption("requireApproval",

      form.add(new BooleanOption("requireApproval",

            getString("gb.requireApproval"),

            getString("gb.requireApprovalDescription"),

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

@@ -460,19 +462,19 @@
      //

      // RECEIVE

      //

      form.add(new CheckboxOption("isFrozen",

      form.add(new BooleanOption("isFrozen",

            getString("gb.isFrozen"),

            getString("gb.isFrozenDescription"),

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



      form.add(new CheckboxOption("incrementalPushTags",

      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 CheckboxOption("verifyCommitter",

      form.add(new BooleanOption("verifyCommitter",

            getString("gb.verifyCommitter"),

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

            verifyCommitter).setIsHtmlDescription(true));

@@ -547,17 +549,17 @@
            "span6",

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



      form.add(new CheckboxOption("showRemoteBranches",

      form.add(new BooleanOption("showRemoteBranches",

            getString("gb.showRemoteBranches"),

            getString("gb.showRemoteBranchesDescription"),

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



      form.add(new CheckboxOption("skipSizeCalculation",

      form.add(new BooleanOption("skipSizeCalculation",

            getString("gb.skipSizeCalculation"),

            getString("gb.skipSizeCalculationDescription"),

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



      form.add(new CheckboxOption("skipSummaryMetrics",

      form.add(new BooleanOption("skipSummaryMetrics",

            getString("gb.skipSummaryMetrics"),

            getString("gb.skipSummaryMetricsDescription"),

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

@@ -679,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