From a21fc59ea5b6e38068d90e64c7a2a2c097d588a3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 09 Apr 2012 08:43:03 -0400
Subject: [PATCH] Fixed: could not clear any RepositoryModel setting list (issue 81)
---
src/com/gitblit/GitBlit.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 7b557d7..e166795 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1050,21 +1050,43 @@
config.setBoolean("gitblit", null, "showReadme", repository.showReadme);
config.setBoolean("gitblit", null, "skipSizeCalculation", repository.skipSizeCalculation);
config.setBoolean("gitblit", null, "skipSummaryMetrics", repository.skipSummaryMetrics);
- config.setStringList("gitblit", null, "federationSets", repository.federationSets);
config.setString("gitblit", null, "federationStrategy",
repository.federationStrategy.name());
config.setBoolean("gitblit", null, "isFederated", repository.isFederated);
- if (!ArrayUtils.isEmpty(repository.preReceiveScripts)) {
+
+ // federation sets
+ if (ArrayUtils.isEmpty(repository.federationSets)) {
+ config.unset("gitblit", null, "federationSets");
+ } else {
+ config.setStringList("gitblit", null, "federationSets", repository.federationSets);
+ }
+
+ // pre receive scripts
+ if (ArrayUtils.isEmpty(repository.preReceiveScripts)) {
+ config.unset("gitblit", null, "preReceiveScript");
+ } else {
config.setStringList("gitblit", null, "preReceiveScript", repository.preReceiveScripts);
}
- if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {
+
+ // post receive scripts
+ if (ArrayUtils.isEmpty(repository.postReceiveScripts)) {
+ config.unset("gitblit", null, "postReceiveScript");
+ } else {
config.setStringList("gitblit", null, "postReceiveScript",
repository.postReceiveScripts);
}
- if (!ArrayUtils.isEmpty(repository.mailingLists)) {
+
+ // mailing lists
+ if (ArrayUtils.isEmpty(repository.mailingLists)) {
+ config.unset("gitblit", null, "mailingList");
+ } else {
config.setStringList("gitblit", null, "mailingList", repository.mailingLists);
}
- if (!ArrayUtils.isEmpty(repository.indexedBranches)) {
+
+ // indexed branches
+ if (ArrayUtils.isEmpty(repository.indexedBranches)) {
+ config.unset("gitblit", null, "indexBranch");
+ } else {
config.setStringList("gitblit", null, "indexBranch", repository.indexedBranches);
}
try {
--
Gitblit v1.9.1