From bd01eebfa57b4012bc7a7abc1aaaa1b69278b9de Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 19 Feb 2012 15:38:50 -0500
Subject: [PATCH] Merged issues/lucene branch
---
src/com/gitblit/wicket/pages/RepositoriesPage.java | 37 +++++--------------------------------
1 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index 21efdda..07f7ad4 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -22,7 +22,6 @@
import java.text.MessageFormat;
import java.util.List;
-import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
@@ -91,26 +90,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));
}
@@ -155,23 +146,5 @@
error(message, t, false);
}
return message;
- }
-
- @Override
- protected void onBeforeRender() {
- if (GitBlit.isDebugMode()) {
- // strip Wicket tags in debug mode for jQuery DOM traversal
- Application.get().getMarkupSettings().setStripWicketTags(true);
- }
- super.onBeforeRender();
- }
-
- @Override
- protected void onAfterRender() {
- if (GitBlit.isDebugMode()) {
- // restore Wicket debug tags
- Application.get().getMarkupSettings().setStripWicketTags(false);
- }
- super.onAfterRender();
}
}
--
Gitblit v1.9.1