From 531abe4fca6db8bd65279c9fc3d22a84cb930756 Mon Sep 17 00:00:00 2001
From: Eddy Young <jeyoung@priscimon.com>
Date: Tue, 19 May 2015 16:02:46 -0400
Subject: [PATCH] More changes
---
src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html | 1 -
src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java | 11 +++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html
index d4dd3bc..f9062e9 100644
--- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html
@@ -62,7 +62,6 @@
</ul>
</div>
- // TODO implement repositories list
<div class="btn-group">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <wicket:message key="gb.repository"></wicket:message>: <span style="font-weight:bold;" wicket:id="currentRepository"></span> <span class="caret"></span></a>
<ul class="dropdown-menu">
diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
index 6adf394..6b37299 100644
--- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
@@ -72,6 +72,7 @@
final String[] statiiParam = (params == null) ? TicketsUI.openStatii : params.getStringArray(Lucene.status.name());
final String assignedToParam = (params == null) ? "" : params.getString(Lucene.responsible.name(), null);
final String milestoneParam = (params == null) ? "" : params.getString(Lucene.milestone.name(), null);
+ // todo jeyoung add repository to this filter
final String queryParam = (params == null || StringUtils.isEmpty(params.getString("q", null))) ? "watchedby:" + username : params.getString("q", null);
final String searchParam = (params == null) ? "" : params.getString("s", null);
final String sortBy = (params == null) ? "" : Lucene.fromString(params.getString("sort", Lucene.created.name())).name();
@@ -257,9 +258,7 @@
add(sortMenu);
// by repository
- List<RepositoryModel> repositoryChoices = new ArrayList<RepositoryModel>();
- // todo add repository choices here
-
+ List<RepositoryModel> repositoryChoices = getRepositoryModels();
RepositoryModel currentRepository = repositoryChoices.size() > 0 ? repositoryChoices.get(0) : null;
for (RepositoryModel r : repositoryChoices) {
if (r.name.equals(repository)) {
@@ -269,6 +268,8 @@
}
add(new Label("currentRepository", currentRepository == null ? "none" : currentRepository.name));
+ // todo insert a "none" option that will show tickets for all
+ // repositories
ListDataProvider<RepositoryModel> repositoryChoicesDp = new ListDataProvider<RepositoryModel>(repositoryChoices);
DataView<RepositoryModel> repositoryMenu = new DataView<RepositoryModel>("repository", repositoryChoicesDp) {
private static final long serialVersionUID = 1L;
@@ -303,6 +304,8 @@
qb.and(q.toSubquery().toString());
}
}
+
+ // todo jeyoung specify repository name, similar to above
final String luceneQuery;
if (qb.containsField(Lucene.createdby.name())
@@ -371,7 +374,7 @@
params.add("direction", "asc");
}
if (!StringUtils.isEmpty(repository)) {
- params.add("repository", repository);
+ params.add(Lucene.repository.name(), repository);
}
if (page > 1) {
params.add("pg", "" + page);
--
Gitblit v1.9.1