From 4acd8c1a8b02ff55872069fb84403993bbb7cb69 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 16 Apr 2016 14:46:30 -0400
Subject: [PATCH] Merge pull request #1060 from gitblit/966-Searching-Always-Over-All-Repositories
---
src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
index b2fd903..1d81061 100644
--- a/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
@@ -66,6 +66,8 @@
// default values
ArrayList<String> repositories = new ArrayList<String>();
String query = "";
+ boolean allRepos = false;
+
int page = 1;
int pageSize = app().settings().getInteger(Keys.web.itemsPerPage, 50);
@@ -91,8 +93,9 @@
List<String> list = StringUtils.getStringsFromValue(value);
repositories.addAll(list);
}
-
- if (params.containsKey("allrepos")) {
+
+ allRepos = params.getAsBoolean("allrepos", false);
+ if (allRepos) {
repositories.addAll(availableRepositories);
}
@@ -133,7 +136,7 @@
// search form
final Model<String> queryModel = new Model<String>(query);
final Model<ArrayList<String>> repositoriesModel = new Model<ArrayList<String>>(searchRepositories);
- final Model<Boolean> allreposModel = new Model<Boolean>(params != null && params.containsKey("allrepos"));
+ final Model<Boolean> allreposModel = new Model<Boolean>(allRepos);
SessionlessForm<Void> form = new SessionlessForm<Void>("searchForm", getClass()) {
private static final long serialVersionUID = 1L;
--
Gitblit v1.9.1