From d896e62505a429ee27237b3302d7c04e7ff8e6df Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 15 Mar 2012 18:02:14 -0400
Subject: [PATCH] Refactored Lucene integration and fixed two index deleteDocument bugs
---
src/com/gitblit/wicket/pages/RepositoriesPage.java | 35 ++++++-----------------------------
1 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index bc33b01..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,22 +90,18 @@
@Override
protected void addDropDownMenus(List<PageRegistration> pages) {
- PageParameters currentParameters = getPageParameters();
- int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 14);
- if (currentParameters != null && !currentParameters.containsKey("db")) {
- currentParameters.put("db", daysBack);
- }
+ PageParameters params = getPageParameters();
DropDownMenuRegistration menu = new DropDownMenuRegistration("gb.filters",
RepositoriesPage.class);
// preserve time filter option on repository choices
- menu.menuItems.addAll(getRepositoryFilterItems(currentParameters));
-
+ 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));
}
@@ -151,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