From 0457984cef51c24f08d32fd802eb7d3c8a204920 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 18 Jun 2013 21:55:25 -0400
Subject: Indicate default days back filter selection

---
 src/main/java/com/gitblit/wicket/pages/RootPage.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index e8d10074..d21be366 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -300,6 +300,17 @@ public abstract class RootPage extends BasePage {
 		if (daysBack < 1) {
 			daysBack = 7;
 		}
+		PageParameters clonedParams;;
+		if (params == null) {
+			clonedParams = new PageParameters();
+		} else {
+			clonedParams = new PageParameters(params);
+		}
+		
+		if (!clonedParams.containsKey("db")) {
+			clonedParams.put("db",  daysBack);
+		}
+		
 		List<DropDownMenuItem> items = new ArrayList<DropDownMenuItem>();
 		Set<Integer> choicesSet = new TreeSet<Integer>(GitBlit.getIntegers(Keys.web.activityDurationChoices));
 		if (choicesSet.isEmpty()) {
@@ -310,7 +321,7 @@ public abstract class RootPage extends BasePage {
 		String lastDaysPattern = getString("gb.lastNDays");
 		for (Integer db : choices) {
 			String txt = MessageFormat.format(lastDaysPattern, db);
-			items.add(new DropDownMenuItem(txt, "db", db.toString(), params));
+			items.add(new DropDownMenuItem(txt, "db", db.toString(), clonedParams));
 		}
 		items.add(new DropDownMenuItem());
 		return items;
-- 
cgit v1.2.3