From 600d43db0c6c19fafa2f5f313170f31cc82acb9c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 26 Sep 2014 09:06:29 -0400
Subject: [PATCH] Respect repository default integration branch for new proposal tickets
---
src/main/java/com/gitblit/client/EditRepositoryDialog.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/client/EditRepositoryDialog.java b/src/main/java/com/gitblit/client/EditRepositoryDialog.java
index 1c499ee..ef665d1 100644
--- a/src/main/java/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/main/java/com/gitblit/client/EditRepositoryDialog.java
@@ -58,6 +58,8 @@
import javax.swing.ListCellRenderer;
import javax.swing.ScrollPaneConstants;
+import org.eclipse.jgit.lib.Repository;
+
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.AuthorizationControl;
import com.gitblit.Constants.FederationStrategy;
@@ -88,8 +90,14 @@
private JTextField descriptionField;
- private JCheckBox useDocs;
+ private JCheckBox acceptNewPatchsets;
+ private JCheckBox acceptNewTickets;
+
+ private JCheckBox requireApproval;
+
+ private JComboBox mergeToField;
+
private JCheckBox useIncrementalPushTags;
private JCheckBox showRemoteBranches;
@@ -207,8 +215,22 @@
ownersPalette = new JPalette<String>(true);
- useDocs = new JCheckBox(Translation.get("gb.useDocsDescription"),
- anRepository.useDocs);
+ acceptNewTickets = new JCheckBox(Translation.get("gb.acceptsNewTicketsDescription"),
+ anRepository.acceptNewTickets);
+ acceptNewPatchsets = new JCheckBox(Translation.get("gb.acceptsNewPatchsetsDescription"),
+ anRepository.acceptNewPatchsets);
+ requireApproval = new JCheckBox(Translation.get("gb.requireApprovalDescription"),
+ anRepository.requireApproval);
+
+ if (ArrayUtils.isEmpty(anRepository.availableRefs)) {
+ mergeToField = new JComboBox();
+ mergeToField.setEnabled(false);
+ } else {
+ mergeToField = new JComboBox(
+ anRepository.availableRefs.toArray());
+ mergeToField.setSelectedItem(anRepository.mergeTo);
+ }
+
useIncrementalPushTags = new JCheckBox(Translation.get("gb.useIncrementalPushTagsDescription"),
anRepository.useIncrementalPushTags);
showRemoteBranches = new JCheckBox(
@@ -302,8 +324,13 @@
fieldsPanel.add(newFieldPanel(Translation.get("gb.gcPeriod"), gcPeriod));
fieldsPanel.add(newFieldPanel(Translation.get("gb.gcThreshold"), gcThreshold));
- fieldsPanel
- .add(newFieldPanel(Translation.get("gb.enableDocs"), useDocs));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.acceptsNewTickets"),
+ acceptNewTickets));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.acceptsNewPatchsets"),
+ acceptNewPatchsets));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.requireApproval"),
+ requireApproval));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.mergeTo"), mergeToField));
fieldsPanel
.add(newFieldPanel(Translation.get("gb.enableIncrementalPushTags"), useIncrementalPushTags));
fieldsPanel.add(newFieldPanel(Translation.get("gb.showRemoteBranches"),
@@ -558,7 +585,11 @@
: headRefField.getSelectedItem().toString();
repository.gcPeriod = (Integer) gcPeriod.getSelectedItem();
repository.gcThreshold = gcThreshold.getText();
- repository.useDocs = useDocs.isSelected();
+ repository.acceptNewPatchsets = acceptNewPatchsets.isSelected();
+ repository.acceptNewTickets = acceptNewTickets.isSelected();
+ repository.requireApproval = requireApproval.isSelected();
+ repository.mergeTo = mergeToField.getSelectedItem() == null ? null
+ : Repository.shortenRefName(mergeToField.getSelectedItem().toString());
repository.useIncrementalPushTags = useIncrementalPushTags.isSelected();
repository.showRemoteBranches = showRemoteBranches.isSelected();
repository.skipSizeCalculation = skipSizeCalculation.isSelected();
--
Gitblit v1.9.1