From b23b67c1cc0b2541580f23c9aec97c0b84a823f4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Feb 2014 09:56:37 -0500
Subject: [PATCH] Select default/configured gc period in create/edit repository page
---
releases.moxie | 1 +
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index a533977..4fa313a 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -21,6 +21,7 @@
- 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 bb16610..c4f480b 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -449,6 +449,10 @@
form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(availableRefs.size() > 0));
boolean gcEnabled = app().settings().getBoolean(Keys.git.enableGarbageCollection, false);
+ int defaultGcPeriod = app().settings().getInteger(Keys.git.defaultGarbageCollectionPeriod, 7);
+ if (repositoryModel.gcPeriod == 0) {
+ repositoryModel.gcPeriod = defaultGcPeriod;
+ }
List<Integer> gcPeriods = Arrays.asList(1, 2, 3, 4, 5, 7, 10, 14 );
form.add(new DropDownChoice<Integer>("gcPeriod", gcPeriods, new GCPeriodRenderer()).setEnabled(gcEnabled));
form.add(new TextField<String>("gcThreshold").setEnabled(gcEnabled));
--
Gitblit v1.9.1