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 +++++++++++++++++++++++++++-----
 docs/04_releases.mkd         |    4 ++++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 94b4c88..28b9281 100644
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -4,6 +4,10 @@
 
 **%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%) | [war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) | [express](http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) | [api](http://code.google.com/p/gitblit/downloads/detail?name=%API%)) based on [%JGIT%][jgit] &nbsp; *released %BUILDDATE%*
 
+#### fixes
+
+- Fixed bug where you could not remove all selections from a RepositoryModel list (permitted users, permitted teams, hook scripts, federation sets, etc) (issue 81)
+
 **0.9.2** *released 2012-04-04*
 
 #### changes
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