From 8f86e2d6469269323bcd7b0788c56cf08ac34c49 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 30 Dec 2011 07:53:00 -0500
Subject: [PATCH] Indicate selected filters. Strip default db value from links.
---
src/com/gitblit/wicket/pages/RepositoriesPage.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index 21efdda..bc33b01 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -91,20 +91,16 @@
@Override
protected void addDropDownMenus(List<PageRegistration> pages) {
- int daysBack = 0;
PageParameters currentParameters = getPageParameters();
- if (currentParameters != null && currentParameters.containsKey("db")) {
- daysBack = currentParameters.getInt("db");
- }
- PageParameters params = null;
- if (daysBack > 0) {
- params = new PageParameters("db=" + daysBack);
+ int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 14);
+ if (currentParameters != null && !currentParameters.containsKey("db")) {
+ currentParameters.put("db", daysBack);
}
DropDownMenuRegistration menu = new DropDownMenuRegistration("gb.filters",
RepositoriesPage.class);
// preserve time filter option on repository choices
- menu.menuItems.addAll(getRepositoryFilterItems(params));
+ menu.menuItems.addAll(getRepositoryFilterItems(currentParameters));
// preserve repository filter option on time choices
menu.menuItems.addAll(getTimeFilterItems(currentParameters));
--
Gitblit v1.9.1