From eb96eab513101783a750c13419de6bdce3d2fa4c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 20 Dec 2011 19:36:56 -0500
Subject: [PATCH] Renamed GitblitUserService, sendMail method, sendmail.groovy, and RepositoryModel.mailingLists
---
src/com/gitblit/client/EditRepositoryDialog.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index 44b6fc6..b727862 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -89,7 +89,7 @@
private JCheckBox isFrozen;
- private JTextField mailRecipientsField;
+ private JTextField mailingListsField;
private JComboBox accessRestriction;
@@ -164,8 +164,8 @@
anRepository.skipSummaryMetrics);
isFrozen = new JCheckBox(Translation.get("gb.isFrozenDescription"), anRepository.isFrozen);
- mailRecipientsField = new JTextField(anRepository.mailRecipients == null ? ""
- : StringUtils.flattenStrings(anRepository.mailRecipients, " "), 50);
+ mailingListsField = new JTextField(anRepository.mailingLists == null ? ""
+ : StringUtils.flattenStrings(anRepository.mailingLists, " "), 50);
accessRestriction = new JComboBox(AccessRestrictionType.values());
accessRestriction.setRenderer(new AccessRestrictionRenderer());
@@ -198,7 +198,7 @@
fieldsPanel
.add(newFieldPanel(Translation.get("gb.skipSummaryMetrics"), skipSummaryMetrics));
fieldsPanel.add(newFieldPanel(Translation.get("gb.isFrozen"), isFrozen));
- fieldsPanel.add(newFieldPanel(Translation.get("gb.mailRecipients"), mailRecipientsField));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.mailingLists"), mailingListsField));
usersPalette = new JPalette<String>();
JPanel accessPanel = new JPanel(new BorderLayout(5, 5));
@@ -371,8 +371,17 @@
repository.skipSummaryMetrics = skipSummaryMetrics.isSelected();
repository.isFrozen = isFrozen.isSelected();
- repository.mailRecipients = StringUtils.getStringsFromValue(mailRecipientsField.getText()
- .trim(), " ");
+ String ml = mailingListsField.getText();
+ 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());
+ }
+ repository.mailingLists = new ArrayList<String>(list);
+ }
repository.accessRestriction = (AccessRestrictionType) accessRestriction.getSelectedItem();
repository.federationStrategy = (FederationStrategy) federationStrategy.getSelectedItem();
--
Gitblit v1.9.1