From 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66 Mon Sep 17 00:00:00 2001
From: Eddy Young <jeyoung@priscimon.com>
Date: Fri, 22 May 2015 03:47:09 -0400
Subject: [PATCH] Merge branch 'develop' into ticket-57_develop
---
src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
index 6adf394..ec0648a 100644
--- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
@@ -27,6 +27,7 @@
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import com.gitblit.Keys;
+import com.gitblit.client.Translation;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.TicketModel;
import com.gitblit.models.TicketModel.Status;
@@ -75,7 +76,7 @@
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();
- final String repository = (params == null) ? "" : Lucene.fromString(params.getString("repository", Lucene.repository.name())).name();
+ final String repository = (params == null) ? "" : params.getString("repository", null);
final boolean desc = (params == null) ? true : !"asc".equals(params.getString("direction", "desc"));
// add the user title panel
@@ -132,6 +133,17 @@
add(new BookmarkablePageLink<Void>("questionsQuery", MyTicketsPage.class,
queryParameters(
Lucene.type.matches(TicketModel.Type.Question.name()),
+ milestoneParam,
+ statiiParam,
+ assignedToParam,
+ sortBy,
+ desc,
+ repository,
+ 1)));
+
+ add(new BookmarkablePageLink<Void>("maintenanceQuery", MyTicketsPage.class,
+ queryParameters(
+ Lucene.type.matches(TicketModel.Type.Maintenance.name()),
milestoneParam,
statiiParam,
assignedToParam,
@@ -233,6 +245,10 @@
sortChoices.add(new TicketSort(getString("gb.sortLeastPatchsetRevisions"), Lucene.patchsets.name(), false));
sortChoices.add(new TicketSort(getString("gb.sortMostVotes"), Lucene.votes.name(), true));
sortChoices.add(new TicketSort(getString("gb.sortLeastVotes"), Lucene.votes.name(), false));
+ sortChoices.add(new TicketSort(getString("gb.sortHighestPriority"), Lucene.priority.name(), true));
+ sortChoices.add(new TicketSort(getString("gb.sortLowestPriority"), Lucene.priority.name(), false));
+ sortChoices.add(new TicketSort(getString("gb.sortHighestSeverity"), Lucene.severity.name(), true));
+ sortChoices.add(new TicketSort(getString("gb.sortLowestSeverity"), Lucene.severity.name(), false));
TicketSort currentSort = sortChoices.get(0);
for (TicketSort ts : sortChoices) {
@@ -257,9 +273,10 @@
add(sortMenu);
// by repository
- List<RepositoryModel> repositoryChoices = new ArrayList<RepositoryModel>();
- // todo add repository choices here
-
+ List<RepositoryModel> repositoryChoices = getRepositoryModels();
+ RepositoryModel noneChoice = new RepositoryModel();
+ noneChoice.name = Translation.get("gb.all");
+ repositoryChoices.add(0, noneChoice);
RepositoryModel currentRepository = repositoryChoices.size() > 0 ? repositoryChoices.get(0) : null;
for (RepositoryModel r : repositoryChoices) {
if (r.name.equals(repository)) {
@@ -267,7 +284,7 @@
break;
}
}
- add(new Label("currentRepository", currentRepository == null ? "none" : currentRepository.name));
+ add(new Label("currentRepository", currentRepository == null ? "none" : currentRepository.toString()));
ListDataProvider<RepositoryModel> repositoryChoicesDp = new ListDataProvider<RepositoryModel>(repositoryChoices);
DataView<RepositoryModel> repositoryMenu = new DataView<RepositoryModel>("repository", repositoryChoicesDp) {
@@ -276,9 +293,8 @@
@Override
public void populateItem(final Item<RepositoryModel> item) {
final RepositoryModel r = item.getModelObject();
- // todo add repository parameter
PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, r.name, 1);
- item.add(new LinkPanel("repositoryLink", null, r.name, MyTicketsPage.class, params).setRenderBodyOnly(true));
+ item.add(new LinkPanel("repositoryLink", null, r.toString(), MyTicketsPage.class, params).setRenderBodyOnly(true));
}
};
add(repositoryMenu);
@@ -303,6 +319,12 @@
qb.and(q.toSubquery().toString());
}
}
+
+ if (!qb.containsField(Lucene.repository.name()) && !StringUtils.isEmpty(repository)) {
+ QueryBuilder q1 = new QueryBuilder();
+ q1.and(Lucene.repository.matches(repository));
+ qb.and(q1.toSubquery().toString());
+ }
final String luceneQuery;
if (qb.containsField(Lucene.createdby.name())
@@ -338,7 +360,6 @@
add(new TicketListPanel("ticketList", results, showSwatch, true));
}
- // todo add repository name here
protected PageParameters queryParameters(
String query,
String milestone,
@@ -371,7 +392,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