From 91780e2e17a8020872c8da2d8941114e098ef2a4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 16 Feb 2012 07:39:48 -0500 Subject: [PATCH] Merge pull request #7 from plm/protect_refs_hook --- src/com/gitblit/wicket/pages/RepositoriesPage.java | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java index 21efdda..f679c76 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.java +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java @@ -91,26 +91,18 @@ @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); - } + PageParameters params = getPageParameters(); DropDownMenuRegistration menu = new DropDownMenuRegistration("gb.filters", RepositoriesPage.class); // preserve time filter option on repository choices menu.menuItems.addAll(getRepositoryFilterItems(params)); - + // preserve repository filter option on time choices - menu.menuItems.addAll(getTimeFilterItems(currentParameters)); - + menu.menuItems.addAll(getTimeFilterItems(params)); + if (menu.menuItems.size() > 0) { - // Reset Filter + // Reset Filter menu.menuItems.add(new DropDownMenuItem(getString("gb.reset"), null, null)); } -- Gitblit v1.9.1