From 2aa69accf0aeb3f8781dad93cbafd8c6dc3a71f6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 27 Mar 2014 09:27:40 -0400
Subject: [PATCH] Merged #37 "Fix repository mailing list editing which prevented field reset"
---
releases.moxie | 1 +
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index c9687e2..0a57d40 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -10,6 +10,7 @@
text: ~
security: ~
fixes:
+ - Repository mailing lists could not be reset from the Edit Repository page (issue-399)
- Ensure the Lucene ticket index is updated on repository deletion.
changes:
- Option to allow LDAP users to directly authenticate without performing LDAP searches
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index f860eeb..1f37763 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -339,7 +339,9 @@
// set author metric exclusions
String ax = metricAuthorExclusions.getObject();
- if (!StringUtils.isEmpty(ax)) {
+ if (StringUtils.isEmpty(ax)) {
+ repositoryModel.metricAuthorExclusions = new ArrayList<String>();
+ } else {
Set<String> list = new HashSet<String>();
for (String exclusion : StringUtils.getStringsFromValue(ax, " ")) {
if (StringUtils.isEmpty(exclusion)) {
@@ -356,7 +358,9 @@
// set mailing lists
String ml = mailingLists.getObject();
- if (!StringUtils.isEmpty(ml)) {
+ if (StringUtils.isEmpty(ml)) {
+ repositoryModel.mailingLists = new ArrayList<String>();
+ } else {
Set<String> list = new HashSet<String>();
for (String address : ml.split("(,|\\s)")) {
if (StringUtils.isEmpty(address)) {
--
Gitblit v1.9.1