Fixed: could not clear any RepositoryModel setting list (issue 81)

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 94b4c8862fa645b03ffdcddcec81cdfc3da1d97e..28b92810564e4b6ced2bf11799bc198eda4536bc 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -4,6 +4,10 @@
 \r
 **%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]   *released %BUILDDATE%*\r
 \r
+#### fixes\r
+\r
+- Fixed bug where you could not remove all selections from a RepositoryModel list (permitted users, permitted teams, hook scripts, federation sets, etc) (issue 81)\r
+\r
 **0.9.2** *released 2012-04-04*\r
 \r
 #### changes\r

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 7b557d79cbaee47a1a62a22e5085d9520c778944..e16679581e46a8e4723c9199341a09ae1e6a652d 100644 (file)
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1050,21 +1050,43 @@ public class GitBlit implements ServletContextListener {
                config.setBoolean("gitblit", null, "showReadme", repository.showReadme);\r
                config.setBoolean("gitblit", null, "skipSizeCalculation", repository.skipSizeCalculation);\r
                config.setBoolean("gitblit", null, "skipSummaryMetrics", repository.skipSummaryMetrics);\r
-               config.setStringList("gitblit", null, "federationSets", repository.federationSets);\r
                config.setString("gitblit", null, "federationStrategy",\r
                                repository.federationStrategy.name());\r
                config.setBoolean("gitblit", null, "isFederated", repository.isFederated);\r
-               if (!ArrayUtils.isEmpty(repository.preReceiveScripts)) {\r
+\r
+               // federation sets\r
+               if (ArrayUtils.isEmpty(repository.federationSets)) {\r
+                       config.unset("gitblit", null, "federationSets");\r
+               } else {\r
+                       config.setStringList("gitblit", null, "federationSets", repository.federationSets);\r
+               }\r
+\r
+               // pre receive scripts\r
+               if (ArrayUtils.isEmpty(repository.preReceiveScripts)) {\r
+                       config.unset("gitblit", null, "preReceiveScript");\r
+               } else {\r
                        config.setStringList("gitblit", null, "preReceiveScript", repository.preReceiveScripts);\r
                }\r
-               if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {\r
+               \r
+               // post receive scripts\r
+               if (ArrayUtils.isEmpty(repository.postReceiveScripts)) {\r
+                       config.unset("gitblit", null, "postReceiveScript");\r
+               } else {\r
                        config.setStringList("gitblit", null, "postReceiveScript",\r
                                        repository.postReceiveScripts);\r
                }\r
-               if (!ArrayUtils.isEmpty(repository.mailingLists)) {\r
+               \r
+               // mailing lists\r
+               if (ArrayUtils.isEmpty(repository.mailingLists)) {\r
+                       config.unset("gitblit", null, "mailingList");\r
+               } else {\r
                        config.setStringList("gitblit", null, "mailingList", repository.mailingLists);\r
                }\r
-               if (!ArrayUtils.isEmpty(repository.indexedBranches)) {\r
+               \r
+               // indexed branches\r
+               if (ArrayUtils.isEmpty(repository.indexedBranches)) {\r
+                       config.unset("gitblit", null, "indexBranch");\r
+               } else {\r
                        config.setStringList("gitblit", null, "indexBranch", repository.indexedBranches);\r
                }\r
                try {\r