Select default/configured gc period in create/edit repository page

diff --git a/releases.moxie b/releases.moxie
index a533977858ba4255b10274d3d515be6b1b1146e6..4fa313a76f820ed29154405139bea40ec6128dd1 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -21,6 +21,7 @@ r20: {
        - Fixed NPE when attempting to add a permission without a registrant (issue-344)
        - Invalidate all cached repository data on "clear cache" (issue-346)
        - Fix chart failures when an apostrophe is in a user display name (issue-350, pr-128)
+       - Fix exception in create repository when not selecting a garbage collection period (issue-366)
        - Stop setting admin permission based on undocumented Redmine REST API behavior (issue-368)
        - Fix support url decoding with non-ascii characters (pr-136)
        - Fix potential NPE on removing uncached repository from cache

diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index bb1661013679939239263a7a3c2e6b11f72bf047..c4f480bbebd9d9211c61eb0241cc069bddb93bbb 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -449,6 +449,10 @@ public class EditRepositoryPage extends RootSubPage {
                form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(availableRefs.size() > 0));\r
 \r
                boolean gcEnabled = app().settings().getBoolean(Keys.git.enableGarbageCollection, false);\r
+               int defaultGcPeriod = app().settings().getInteger(Keys.git.defaultGarbageCollectionPeriod, 7);\r
+               if (repositoryModel.gcPeriod == 0) {\r
+                       repositoryModel.gcPeriod = defaultGcPeriod;\r
+               }\r
                List<Integer> gcPeriods = Arrays.asList(1, 2, 3, 4, 5, 7, 10, 14 );\r
                form.add(new DropDownChoice<Integer>("gcPeriod", gcPeriods, new GCPeriodRenderer()).setEnabled(gcEnabled));\r
                form.add(new TextField<String>("gcThreshold").setEnabled(gcEnabled));\r