From dcb6c5ac7494eddf7435d09353533cf605464bb5 Mon Sep 17 00:00:00 2001 From: Eddy Young Date: Mon, 18 May 2015 21:11:27 +0100 Subject: Initial changes for ticket-57 Added tags to .gitignore --- src/main/distrib/data/gitblit.properties | 3 +- .../com/gitblit/wicket/pages/MyTicketsPage.html | 10 +++- .../com/gitblit/wicket/pages/MyTicketsPage.java | 64 +++++++++++++++++++--- 3 files changed, 66 insertions(+), 11 deletions(-) (limited to 'src/main') diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index f53cc112..7e7e1f4e 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -497,7 +497,8 @@ git.maxPackSizeLimit = -1 # # SINCE 1.4.0 # RESTART REQUIRED -tickets.service = +tickets.service = com.gitblit.tickets.FileTicketService +# # Globally enable or disable creation of new bug, enhancement, task, etc tickets # for all repositories. diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index b0bc1949..d4dd3bc0 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -62,6 +62,14 @@ + // TODO implement repositories list +
+ : + +
+
- // TODO implement repositories list
:
    diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 6adf394c..6b372993 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 @@ public class MyTicketsPage extends RootPage { 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 @@ public class MyTicketsPage extends RootPage { add(sortMenu); // by repository - List repositoryChoices = new ArrayList(); - // todo add repository choices here - + List repositoryChoices = getRepositoryModels(); RepositoryModel currentRepository = repositoryChoices.size() > 0 ? repositoryChoices.get(0) : null; for (RepositoryModel r : repositoryChoices) { if (r.name.equals(repository)) { @@ -269,6 +268,8 @@ public class MyTicketsPage extends RootPage { } add(new Label("currentRepository", currentRepository == null ? "none" : currentRepository.name)); + // todo insert a "none" option that will show tickets for all + // repositories ListDataProvider repositoryChoicesDp = new ListDataProvider(repositoryChoices); DataView repositoryMenu = new DataView("repository", repositoryChoicesDp) { private static final long serialVersionUID = 1L; @@ -304,6 +305,8 @@ public class MyTicketsPage extends RootPage { } } + // todo jeyoung specify repository name, similar to above + final String luceneQuery; if (qb.containsField(Lucene.createdby.name()) || qb.containsField(Lucene.responsible.name()) @@ -371,7 +374,7 @@ public class MyTicketsPage extends RootPage { 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); -- cgit v1.2.3 From 710620d292488b547fb5311b0372d31e49156823 Mon Sep 17 00:00:00 2001 From: Eddy Young Date: Tue, 19 May 2015 22:30:54 +0100 Subject: Implemented filtering by repository for the My Tickets page --- .../com/gitblit/wicket/pages/MyTicketsPage.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 6b372993..c81da3d5 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.DataView; 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; @@ -72,11 +73,10 @@ public class MyTicketsPage extends RootPage { 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(); - 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 @@ -259,6 +259,9 @@ public class MyTicketsPage extends RootPage { // by repository List 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)) { @@ -266,10 +269,8 @@ public class MyTicketsPage extends RootPage { break; } } - add(new Label("currentRepository", currentRepository == null ? "none" : currentRepository.name)); + add(new Label("currentRepository", currentRepository == null ? "none" : currentRepository.toString())); - // todo insert a "none" option that will show tickets for all - // repositories ListDataProvider repositoryChoicesDp = new ListDataProvider(repositoryChoices); DataView repositoryMenu = new DataView("repository", repositoryChoicesDp) { private static final long serialVersionUID = 1L; @@ -277,9 +278,8 @@ public class MyTicketsPage extends RootPage { @Override public void populateItem(final Item 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); @@ -305,7 +305,11 @@ public class MyTicketsPage extends RootPage { } } - // todo jeyoung specify repository name, similar to above + 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()) @@ -341,7 +345,6 @@ public class MyTicketsPage extends RootPage { add(new TicketListPanel("ticketList", results, showSwatch, true)); } - // todo add repository name here protected PageParameters queryParameters( String query, String milestone, -- cgit v1.2.3 From 4cb1a97509b9b42ca7efb4fa0f727b89b044202d Mon Sep 17 00:00:00 2001 From: Eddy Young Date: Fri, 22 May 2015 11:08:26 +0100 Subject: Replaced repository name as search criterion with repository id --- .../com/gitblit/wicket/pages/MyTicketsPage.java | 59 +++++++++++----------- 1 file changed, 29 insertions(+), 30 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index ec0648a1..4da1dcde 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -27,7 +27,6 @@ import org.apache.wicket.markup.repeater.data.DataView; 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; @@ -76,7 +75,7 @@ public class MyTicketsPage extends RootPage { 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) ? "" : params.getString("repository", null); + final String repositoryId = (params == null) ? "" : params.getString(Lucene.rid.name(), null); final boolean desc = (params == null) ? true : !"asc".equals(params.getString("direction", "desc")); // add the user title panel @@ -94,7 +93,7 @@ public class MyTicketsPage extends RootPage { assignedToParam, sortBy, desc, - repository, + repositoryId, 1))); add(new BookmarkablePageLink("bugsQuery", MyTicketsPage.class, @@ -105,7 +104,7 @@ public class MyTicketsPage extends RootPage { assignedToParam, sortBy, desc, - repository, + repositoryId, 1))); add(new BookmarkablePageLink("enhancementsQuery", MyTicketsPage.class, @@ -116,7 +115,7 @@ public class MyTicketsPage extends RootPage { assignedToParam, sortBy, desc, - repository, + repositoryId, 1))); add(new BookmarkablePageLink("tasksQuery", MyTicketsPage.class, @@ -127,7 +126,7 @@ public class MyTicketsPage extends RootPage { assignedToParam, sortBy, desc, - repository, + repositoryId, 1))); add(new BookmarkablePageLink("questionsQuery", MyTicketsPage.class, @@ -138,7 +137,7 @@ public class MyTicketsPage extends RootPage { assignedToParam, sortBy, desc, - repository, + repositoryId, 1))); add(new BookmarkablePageLink("maintenanceQuery", MyTicketsPage.class, @@ -149,7 +148,7 @@ public class MyTicketsPage extends RootPage { assignedToParam, sortBy, desc, - repository, + repositoryId, 1))); add(new BookmarkablePageLink("resetQuery", MyTicketsPage.class, @@ -172,7 +171,7 @@ public class MyTicketsPage extends RootPage { assignedToParam, sortBy, desc, - repository, + repositoryId, 1))); add(new BookmarkablePageLink("watchedQuery", MyTicketsPage.class, @@ -183,7 +182,7 @@ public class MyTicketsPage extends RootPage { assignedToParam, sortBy, desc, - repository, + repositoryId, 1))); add(new BookmarkablePageLink("mentionsQuery", MyTicketsPage.class, queryParameters( @@ -193,7 +192,7 @@ public class MyTicketsPage extends RootPage { assignedToParam, sortBy, desc, - repository, + repositoryId, 1))); add(new BookmarkablePageLink("responsibleQuery", MyTicketsPage.class, queryParameters( @@ -203,7 +202,7 @@ public class MyTicketsPage extends RootPage { assignedToParam, sortBy, desc, - repository, + repositoryId, 1))); // states @@ -212,9 +211,9 @@ public class MyTicketsPage extends RootPage { } else { add(new Label("selectedStatii", StringUtils.flattenStrings(Arrays.asList(statiiParam), ","))); } - add(new BookmarkablePageLink("openTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.openStatii, assignedToParam, sortBy, desc, repository, 1))); - add(new BookmarkablePageLink("closedTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.closedStatii, assignedToParam, sortBy, desc, repository, 1))); - add(new BookmarkablePageLink("allTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, repository, 1))); + add(new BookmarkablePageLink("openTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.openStatii, assignedToParam, sortBy, desc, repositoryId, 1))); + add(new BookmarkablePageLink("closedTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.closedStatii, assignedToParam, sortBy, desc, repositoryId, 1))); + add(new BookmarkablePageLink("allTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, repositoryId, 1))); // by status List statii = new ArrayList(Arrays.asList(Status.values())); @@ -226,7 +225,7 @@ public class MyTicketsPage extends RootPage { @Override public void populateItem(final Item item) { final Status status = item.getModelObject(); - PageParameters p = queryParameters(queryParam, milestoneParam, new String [] { status.name().toLowerCase() }, assignedToParam, sortBy, desc, repository, 1); + PageParameters p = queryParameters(queryParam, milestoneParam, new String [] { status.name().toLowerCase() }, assignedToParam, sortBy, desc, repositoryId, 1); String css = TicketsUI.getStatusClass(status); item.add(new LinkPanel("statusLink", css, status.toString(), MyTicketsPage.class, p).setRenderBodyOnly(true)); } @@ -266,7 +265,7 @@ public class MyTicketsPage extends RootPage { @Override public void populateItem(final Item item) { final TicketSort ts = item.getModelObject(); - PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, ts.sortBy, ts.desc, repository, 1); + PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, ts.sortBy, ts.desc, repositoryId, 1); item.add(new LinkPanel("sortLink", null, ts.name, MyTicketsPage.class, params).setRenderBodyOnly(true)); } }; @@ -275,11 +274,11 @@ public class MyTicketsPage extends RootPage { // by repository List repositoryChoices = getRepositoryModels(); RepositoryModel noneChoice = new RepositoryModel(); - noneChoice.name = Translation.get("gb.all"); + noneChoice.name = getString("gb.all"); repositoryChoices.add(0, noneChoice); RepositoryModel currentRepository = repositoryChoices.size() > 0 ? repositoryChoices.get(0) : null; for (RepositoryModel r : repositoryChoices) { - if (r.name.equals(repository)) { + if (r.getRID().equals(repositoryId)) { currentRepository = r; break; } @@ -293,7 +292,7 @@ public class MyTicketsPage extends RootPage { @Override public void populateItem(final Item item) { final RepositoryModel r = item.getModelObject(); - PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, r.name, 1); + PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, r.getRID(), 1); item.add(new LinkPanel("repositoryLink", null, r.toString(), MyTicketsPage.class, params).setRenderBodyOnly(true)); } }; @@ -320,9 +319,9 @@ public class MyTicketsPage extends RootPage { } } - if (!qb.containsField(Lucene.repository.name()) && !StringUtils.isEmpty(repository)) { + if (noneChoice != currentRepository && !qb.containsField(Lucene.rid.name())) { QueryBuilder q1 = new QueryBuilder(); - q1.and(Lucene.repository.matches(repository)); + q1.and(Lucene.rid.matches(repositoryId)); qb.and(q1.toSubquery().toString()); } @@ -354,7 +353,7 @@ public class MyTicketsPage extends RootPage { } int totalResults = results.size() == 0 ? 0 : results.get(0).totalResults; - buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, repository, page, pageSize, results.size(), totalResults); + buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, repositoryId, page, pageSize, results.size(), totalResults); final boolean showSwatch = app().settings().getBoolean(Keys.web.repositoryListSwatches, true); add(new TicketListPanel("ticketList", results, showSwatch, true)); @@ -367,7 +366,7 @@ public class MyTicketsPage extends RootPage { String assignedTo, String sort, boolean descending, - String repository, + String repositoryId, int page) { PageParameters params = WicketUtils.newRepositoryParameter(""); @@ -391,8 +390,8 @@ public class MyTicketsPage extends RootPage { if (!descending) { params.add("direction", "asc"); } - if (!StringUtils.isEmpty(repository)) { - params.add(Lucene.repository.name(), repository); + if (!StringUtils.isEmpty(repositoryId)) { + params.add(Lucene.rid.name(), repositoryId); } if (page > 1) { params.add("pg", "" + page); @@ -407,7 +406,7 @@ public class MyTicketsPage extends RootPage { final String assignedTo, final String sort, final boolean desc, - final String repository, + final String repositoryId, final int page, int pageSize, int count, @@ -416,8 +415,8 @@ public class MyTicketsPage extends RootPage { boolean showNav = total > (2 * pageSize); boolean allowPrev = page > 1; boolean allowNext = (pageSize * (page - 1) + count) < total; - add(new BookmarkablePageLink("prevLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repository, page - 1)).setEnabled(allowPrev).setVisible(showNav)); - add(new BookmarkablePageLink("nextLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repository, page + 1)).setEnabled(allowNext).setVisible(showNav)); + add(new BookmarkablePageLink("prevLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repositoryId, page - 1)).setEnabled(allowPrev).setVisible(showNav)); + add(new BookmarkablePageLink("nextLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repositoryId, page + 1)).setEnabled(allowNext).setVisible(showNav)); if (total <= pageSize) { add(new Label("pageLink").setVisible(false)); @@ -446,7 +445,7 @@ public class MyTicketsPage extends RootPage { @Override public void populateItem(final Item item) { final Integer i = item.getModelObject(); - LinkPanel link = new LinkPanel("page", null, "" + i, MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repository, i)); + LinkPanel link = new LinkPanel("page", null, "" + i, MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repositoryId, i)); link.setRenderBodyOnly(true); if (i == page) { WicketUtils.setCssClass(item, "active"); -- cgit v1.2.3 From 3004fe27640f6851bc0d230a954baa3b157746ee Mon Sep 17 00:00:00 2001 From: Eddy Young Date: Fri, 22 May 2015 22:01:28 +0100 Subject: Changed the repository filter options to those related to the tickets owned by the user. Also, minor refactoring to avoid code duplication. --- .../com/gitblit/wicket/pages/MyTicketsPage.java | 796 +++++++++++---------- 1 file changed, 418 insertions(+), 378 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 4da1dcde..7b85b141 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -17,6 +17,10 @@ package com.gitblit.wicket.pages; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; import java.util.List; import org.apache.wicket.PageParameters; @@ -53,271 +57,288 @@ import com.gitblit.wicket.panels.UserTitlePanel; */ public class MyTicketsPage extends RootPage { - public MyTicketsPage() { - this(null); - } - - public MyTicketsPage(PageParameters params) { - super(params); - setupPage("", getString("gb.myTickets")); - - UserModel currentUser = GitBlitWebSession.get().getUser(); - if (currentUser == null || UserModel.ANONYMOUS.equals(currentUser)) { - setRedirect(true); - setResponsePage(getApplication().getHomePage()); - return; - } - - final String username = currentUser.getName(); - 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); - 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 repositoryId = (params == null) ? "" : params.getString(Lucene.rid.name(), null); - final boolean desc = (params == null) ? true : !"asc".equals(params.getString("direction", "desc")); - - // add the user title panel - add(new UserTitlePanel("userTitlePanel", currentUser, getString("gb.myTickets"))); - - // add search form - add(new TicketSearchForm("ticketSearchForm", null, searchParam, getClass(), params)); - - // standard queries - add(new BookmarkablePageLink("changesQuery", MyTicketsPage.class, - queryParameters( - Lucene.type.matches(TicketModel.Type.Proposal.name()), - milestoneParam, - statiiParam, - assignedToParam, - sortBy, - desc, + public MyTicketsPage() { + this(null); + } + + public MyTicketsPage(PageParameters params) { + super(params); + setupPage("", getString("gb.myTickets")); + + UserModel currentUser = GitBlitWebSession.get().getUser(); + if (currentUser == null || UserModel.ANONYMOUS.equals(currentUser)) { + setRedirect(true); + setResponsePage(getApplication().getHomePage()); + return; + } + + final String username = currentUser.getName(); + final String defaultQueryParam = "watchedby:"+username; + + 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); + final String queryParam = (params == null || StringUtils.isEmpty(params.getString("q", null))) ? defaultQueryParam : 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 repositoryId = (params == null) ? "" : params.getString(Lucene.rid.name(), null); + final boolean desc = (params == null) ? true : !"asc".equals(params.getString("direction", "desc")); + + + // add the user title panel + add(new UserTitlePanel("userTitlePanel", currentUser, getString("gb.myTickets"))); + + // add search form + add(new TicketSearchForm("ticketSearchForm", null, searchParam, getClass(), params)); + + // standard queries + add(new BookmarkablePageLink("changesQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Proposal.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, repositoryId, - 1))); - - add(new BookmarkablePageLink("bugsQuery", MyTicketsPage.class, - queryParameters( - Lucene.type.matches(TicketModel.Type.Bug.name()), - milestoneParam, - statiiParam, - assignedToParam, - sortBy, - desc, + 1))); + + add(new BookmarkablePageLink("bugsQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Bug.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, repositoryId, - 1))); - - add(new BookmarkablePageLink("enhancementsQuery", MyTicketsPage.class, - queryParameters( - Lucene.type.matches(TicketModel.Type.Enhancement.name()), - milestoneParam, - statiiParam, - assignedToParam, - sortBy, - desc, + 1))); + + add(new BookmarkablePageLink("enhancementsQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Enhancement.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, repositoryId, - 1))); - - add(new BookmarkablePageLink("tasksQuery", MyTicketsPage.class, - queryParameters( - Lucene.type.matches(TicketModel.Type.Task.name()), - milestoneParam, - statiiParam, - assignedToParam, - sortBy, - desc, + 1))); + + add(new BookmarkablePageLink("tasksQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Task.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, repositoryId, - 1))); - - add(new BookmarkablePageLink("questionsQuery", MyTicketsPage.class, - queryParameters( - Lucene.type.matches(TicketModel.Type.Question.name()), - milestoneParam, - statiiParam, - assignedToParam, - sortBy, - desc, + 1))); + + add(new BookmarkablePageLink("questionsQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Question.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, repositoryId, - 1))); - - add(new BookmarkablePageLink("maintenanceQuery", MyTicketsPage.class, - queryParameters( - Lucene.type.matches(TicketModel.Type.Maintenance.name()), - milestoneParam, - statiiParam, - assignedToParam, - sortBy, - desc, + 1))); + + add(new BookmarkablePageLink("maintenanceQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Maintenance.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, repositoryId, - 1))); - - add(new BookmarkablePageLink("resetQuery", MyTicketsPage.class, - queryParameters( - null, - milestoneParam, - TicketsUI.openStatii, - null, - null, - true, + 1))); + + add(new BookmarkablePageLink("resetQuery", MyTicketsPage.class, + queryParameters( null, - 1))); - - add(new Label("userDivider")); - add(new BookmarkablePageLink("createdQuery", MyTicketsPage.class, - queryParameters( - Lucene.createdby.matches(username), - milestoneParam, - statiiParam, - assignedToParam, - sortBy, - desc, + milestoneParam, + TicketsUI.openStatii, + null, + null, + true, + null, + 1))); + + add(new Label("userDivider")); + add(new BookmarkablePageLink("createdQuery", MyTicketsPage.class, + queryParameters( + Lucene.createdby.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, repositoryId, - 1))); - - add(new BookmarkablePageLink("watchedQuery", MyTicketsPage.class, - queryParameters( - Lucene.watchedby.matches(username), - milestoneParam, - statiiParam, - assignedToParam, - sortBy, - desc, + 1))); + + add(new BookmarkablePageLink("watchedQuery", MyTicketsPage.class, + queryParameters( + Lucene.watchedby.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, repositoryId, - 1))); - add(new BookmarkablePageLink("mentionsQuery", MyTicketsPage.class, - queryParameters( - Lucene.mentions.matches(username), - milestoneParam, - statiiParam, - assignedToParam, - sortBy, - desc, + 1))); + add(new BookmarkablePageLink("mentionsQuery", MyTicketsPage.class, + queryParameters( + Lucene.mentions.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, repositoryId, - 1))); - add(new BookmarkablePageLink("responsibleQuery", MyTicketsPage.class, - queryParameters( - Lucene.responsible.matches(username), - milestoneParam, - statiiParam, - assignedToParam, - sortBy, - desc, + 1))); + add(new BookmarkablePageLink("responsibleQuery", MyTicketsPage.class, + queryParameters( + Lucene.responsible.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, repositoryId, - 1))); - - // states - if (ArrayUtils.isEmpty(statiiParam)) { - add(new Label("selectedStatii", getString("gb.all"))); - } else { - add(new Label("selectedStatii", StringUtils.flattenStrings(Arrays.asList(statiiParam), ","))); - } - add(new BookmarkablePageLink("openTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.openStatii, assignedToParam, sortBy, desc, repositoryId, 1))); - add(new BookmarkablePageLink("closedTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.closedStatii, assignedToParam, sortBy, desc, repositoryId, 1))); - add(new BookmarkablePageLink("allTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, repositoryId, 1))); - - // by status - List statii = new ArrayList(Arrays.asList(Status.values())); - statii.remove(Status.Closed); - ListDataProvider resolutionsDp = new ListDataProvider(statii); - DataView statiiLinks = new DataView("statii", resolutionsDp) { - private static final long serialVersionUID = 1L; - - @Override - public void populateItem(final Item item) { - final Status status = item.getModelObject(); - PageParameters p = queryParameters(queryParam, milestoneParam, new String [] { status.name().toLowerCase() }, assignedToParam, sortBy, desc, repositoryId, 1); - String css = TicketsUI.getStatusClass(status); - item.add(new LinkPanel("statusLink", css, status.toString(), MyTicketsPage.class, p).setRenderBodyOnly(true)); - } - }; - add(statiiLinks); + 1))); + + // states + if (ArrayUtils.isEmpty(statiiParam)) { + add(new Label("selectedStatii", getString("gb.all"))); + } else { + add(new Label("selectedStatii", StringUtils.flattenStrings(Arrays.asList(statiiParam), ","))); + } + add(new BookmarkablePageLink("openTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.openStatii, assignedToParam, sortBy, desc, repositoryId, 1))); + add(new BookmarkablePageLink("closedTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.closedStatii, assignedToParam, sortBy, desc, repositoryId, 1))); + add(new BookmarkablePageLink("allTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, repositoryId, 1))); + + // by status + List statii = new ArrayList(Arrays.asList(Status.values())); + statii.remove(Status.Closed); + ListDataProvider resolutionsDp = new ListDataProvider(statii); + DataView statiiLinks = new DataView("statii", resolutionsDp) { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final Item item) { + final Status status = item.getModelObject(); + PageParameters p = queryParameters(queryParam, milestoneParam, new String [] { status.name().toLowerCase() }, assignedToParam, sortBy, desc, repositoryId, 1); + String css = TicketsUI.getStatusClass(status); + item.add(new LinkPanel("statusLink", css, status.toString(), MyTicketsPage.class, p).setRenderBodyOnly(true)); + } + }; + add(statiiLinks); // by sort - List sortChoices = new ArrayList(); - sortChoices.add(new TicketSort(getString("gb.sortNewest"), Lucene.created.name(), true)); - sortChoices.add(new TicketSort(getString("gb.sortOldest"), Lucene.created.name(), false)); - sortChoices.add(new TicketSort(getString("gb.sortMostRecentlyUpdated"), Lucene.updated.name(), true)); - sortChoices.add(new TicketSort(getString("gb.sortLeastRecentlyUpdated"), Lucene.updated.name(), false)); - sortChoices.add(new TicketSort(getString("gb.sortMostComments"), Lucene.comments.name(), true)); - sortChoices.add(new TicketSort(getString("gb.sortLeastComments"), Lucene.comments.name(), false)); - sortChoices.add(new TicketSort(getString("gb.sortMostPatchsetRevisions"), Lucene.patchsets.name(), true)); - 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) { - if (ts.sortBy.equals(sortBy) && desc == ts.desc) { - currentSort = ts; - break; - } - } - add(new Label("currentSort", currentSort.name)); - - ListDataProvider sortChoicesDp = new ListDataProvider(sortChoices); - DataView sortMenu = new DataView("sort", sortChoicesDp) { - private static final long serialVersionUID = 1L; - - @Override - public void populateItem(final Item item) { - final TicketSort ts = item.getModelObject(); - PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, ts.sortBy, ts.desc, repositoryId, 1); - item.add(new LinkPanel("sortLink", null, ts.name, MyTicketsPage.class, params).setRenderBodyOnly(true)); - } - }; - add(sortMenu); + List sortChoices = new ArrayList(); + sortChoices.add(new TicketSort(getString("gb.sortNewest"), Lucene.created.name(), true)); + sortChoices.add(new TicketSort(getString("gb.sortOldest"), Lucene.created.name(), false)); + sortChoices.add(new TicketSort(getString("gb.sortMostRecentlyUpdated"), Lucene.updated.name(), true)); + sortChoices.add(new TicketSort(getString("gb.sortLeastRecentlyUpdated"), Lucene.updated.name(), false)); + sortChoices.add(new TicketSort(getString("gb.sortMostComments"), Lucene.comments.name(), true)); + sortChoices.add(new TicketSort(getString("gb.sortLeastComments"), Lucene.comments.name(), false)); + sortChoices.add(new TicketSort(getString("gb.sortMostPatchsetRevisions"), Lucene.patchsets.name(), true)); + 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) { + if (ts.sortBy.equals(sortBy) && desc == ts.desc) { + currentSort = ts; + break; + } + } + add(new Label("currentSort", currentSort.name)); + + ListDataProvider sortChoicesDp = new ListDataProvider(sortChoices); + DataView sortMenu = new DataView("sort", sortChoicesDp) { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final Item item) { + final TicketSort ts = item.getModelObject(); + PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, ts.sortBy, ts.desc, repositoryId, 1); + item.add(new LinkPanel("sortLink", null, ts.name, MyTicketsPage.class, params).setRenderBodyOnly(true)); + } + }; + add(sortMenu); // by repository - List repositoryChoices = getRepositoryModels(); - RepositoryModel noneChoice = new RepositoryModel(); + final List tickets = + query(initializeQueryBuilder(defaultQueryParam, username), 1, Integer.MAX_VALUE, sortBy, desc); + final List repositoryChoices = correspondingRepositories(tickets); + Collections.sort(repositoryChoices, new Comparator() { + private static final long serialVersionUID = 1L; + + @Override + public int compare(RepositoryModel repository1, RepositoryModel repository2) { + return repository1.toString().compareTo(repository2.toString()); + } + }); + + final RepositoryModel noneChoice = new RepositoryModel(); noneChoice.name = getString("gb.all"); repositoryChoices.add(0, noneChoice); - RepositoryModel currentRepository = repositoryChoices.size() > 0 ? repositoryChoices.get(0) : null; - for (RepositoryModel r : repositoryChoices) { - if (r.getRID().equals(repositoryId)) { - currentRepository = r; - break; - } - } - add(new Label("currentRepository", currentRepository == null ? "none" : currentRepository.toString())); - - ListDataProvider repositoryChoicesDp = new ListDataProvider(repositoryChoices); - DataView repositoryMenu = new DataView("repository", repositoryChoicesDp) { - private static final long serialVersionUID = 1L; - - @Override - public void populateItem(final Item item) { - final RepositoryModel r = item.getModelObject(); - PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, r.getRID(), 1); - item.add(new LinkPanel("repositoryLink", null, r.toString(), MyTicketsPage.class, params).setRenderBodyOnly(true)); - } - }; - add(repositoryMenu); - - // Build Query here - QueryBuilder qb = new QueryBuilder(queryParam); - if (!qb.containsField(Lucene.status.name()) && !ArrayUtils.isEmpty(statiiParam)) { - // specify the states - boolean not = false; - QueryBuilder q = new QueryBuilder(); - for (String state : statiiParam) { - if (state.charAt(0) == '!') { - not = true; - q.and(Lucene.status.doesNotMatch(state.substring(1))); - } else { - q.or(Lucene.status.matches(state)); - } - } - if (not) { - qb.and(q.toString()); - } else { - qb.and(q.toSubquery().toString()); - } - } + + RepositoryModel currentRepository = repositoryChoices.size() > 0 ? repositoryChoices.get(0) : null; + for (RepositoryModel r : repositoryChoices) { + if (r.getRID().equals(repositoryId)) { + currentRepository = r; + break; + } + } + add(new Label("currentRepository", currentRepository == null ? "none" : currentRepository.toString())); + + ListDataProvider repositoryChoicesDp = new ListDataProvider(repositoryChoices); + DataView repositoryMenu = new DataView("repository", repositoryChoicesDp) { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final Item item) { + final RepositoryModel r = item.getModelObject(); + PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, r.getRID(), 1); + item.add(new LinkPanel("repositoryLink", null, r.toString(), MyTicketsPage.class, params).setRenderBodyOnly(true)); + } + }; + add(repositoryMenu); + + // Update query with filter criteria + final QueryBuilder qb = initializeQueryBuilder(queryParam, username); + + if (!qb.containsField(Lucene.status.name()) && !ArrayUtils.isEmpty(statiiParam)) { + // specify the states + boolean not = false; + QueryBuilder q = new QueryBuilder(); + for (String state : statiiParam) { + if (state.charAt(0) == '!') { + not = true; + q.and(Lucene.status.doesNotMatch(state.substring(1))); + } else { + q.or(Lucene.status.matches(state)); + } + } + + if (not) { + qb.and(q.toString()); + } else { + qb.and(q.toSubquery().toString()); + } + } if (noneChoice != currentRepository && !qb.containsField(Lucene.rid.name())) { QueryBuilder q1 = new QueryBuilder(); @@ -325,134 +346,153 @@ public class MyTicketsPage extends RootPage { qb.and(q1.toSubquery().toString()); } - final String luceneQuery; - if (qb.containsField(Lucene.createdby.name()) - || qb.containsField(Lucene.responsible.name()) - || qb.containsField(Lucene.watchedby.name())) { - // focused "my tickets" query - luceneQuery = qb.build(); - } else { - // general "my tickets" query - QueryBuilder myQuery = new QueryBuilder(); - myQuery.or(Lucene.createdby.matches(username)); - myQuery.or(Lucene.responsible.matches(username)); - myQuery.or(Lucene.watchedby.matches(username)); - myQuery.and(qb.toSubquery().toString()); - luceneQuery = myQuery.build(); - } - - // paging links - int page = (params != null) ? Math.max(1, WicketUtils.getPage(params)) : 1; - int pageSize = app().settings().getInteger(Keys.tickets.perPage, 25); - - List results; - if(StringUtils.isEmpty(searchParam)) { - results = app().tickets().queryFor(luceneQuery, page, pageSize, sortBy, desc); - } else { - results = app().tickets().searchFor(null, searchParam, page, pageSize); - } - - int totalResults = results.size() == 0 ? 0 : results.get(0).totalResults; - buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, repositoryId, page, pageSize, results.size(), totalResults); - - final boolean showSwatch = app().settings().getBoolean(Keys.web.repositoryListSwatches, true); - add(new TicketListPanel("ticketList", results, showSwatch, true)); - } - - protected PageParameters queryParameters( - String query, - String milestone, - String[] states, - String assignedTo, - String sort, - boolean descending, - String repositoryId, - int page) { - - PageParameters params = WicketUtils.newRepositoryParameter(""); - if (!StringUtils.isEmpty(query)) { - params.add("q", query); - } - if (!StringUtils.isEmpty(milestone)) { - params.add(Lucene.milestone.name(), milestone); - } - if (!ArrayUtils.isEmpty(states)) { - for (String state : states) { - params.add(Lucene.status.name(), state); - } - } - if (!StringUtils.isEmpty(assignedTo)) { - params.add(Lucene.responsible.name(), assignedTo); - } - if (!StringUtils.isEmpty(sort)) { - params.add("sort", sort); - } - if (!descending) { - params.add("direction", "asc"); - } - if (!StringUtils.isEmpty(repositoryId)) { - params.add(Lucene.rid.name(), repositoryId); - } - if (page > 1) { - params.add("pg", "" + page); - } - return params; - } - - protected void buildPager( - final String query, - final String milestone, - final String [] states, - final String assignedTo, - final String sort, - final boolean desc, - final String repositoryId, - final int page, - int pageSize, - int count, - int total) { - - boolean showNav = total > (2 * pageSize); - boolean allowPrev = page > 1; - boolean allowNext = (pageSize * (page - 1) + count) < total; - add(new BookmarkablePageLink("prevLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repositoryId, page - 1)).setEnabled(allowPrev).setVisible(showNav)); - add(new BookmarkablePageLink("nextLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repositoryId, page + 1)).setEnabled(allowNext).setVisible(showNav)); - - if (total <= pageSize) { - add(new Label("pageLink").setVisible(false)); - return; - } - - // determine page numbers to display - int pages = count == 0 ? 0 : ((total / pageSize) + (total % pageSize == 0 ? 0 : 1)); - // preferred number of pagelinks - int segments = 5; - if (pages < segments) { - // not enough data for preferred number of page links - segments = pages; - } - int minpage = Math.min(Math.max(1, page - 2), pages - (segments - 1)); - int maxpage = Math.min(pages, minpage + (segments - 1)); - List sequence = new ArrayList(); - for (int i = minpage; i <= maxpage; i++) { - sequence.add(i); - } - - ListDataProvider pagesDp = new ListDataProvider(sequence); - DataView pagesView = new DataView("pageLink", pagesDp) { - private static final long serialVersionUID = 1L; - - @Override - public void populateItem(final Item item) { - final Integer i = item.getModelObject(); - LinkPanel link = new LinkPanel("page", null, "" + i, MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repositoryId, i)); - link.setRenderBodyOnly(true); - if (i == page) { - WicketUtils.setCssClass(item, "active"); - } - item.add(link); - } - }; - add(pagesView); - } + // paging links + int page = (params != null) ? Math.max(1, WicketUtils.getPage(params)) : 1; + int pageSize = app().settings().getInteger(Keys.tickets.perPage, 25); + + final List results = + StringUtils.isEmpty(searchParam) ? query(qb, page, pageSize, sortBy, desc) : search(searchParam, page, pageSize); + + int totalResults = results.size() == 0 ? 0 : results.get(0).totalResults; + buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, repositoryId, page, pageSize, results.size(), totalResults); + + final boolean showSwatch = app().settings().getBoolean(Keys.web.repositoryListSwatches, true); + add(new TicketListPanel("ticketList", results, showSwatch, true)); + } + + protected PageParameters queryParameters( + String query, + String milestone, + String[] states, + String assignedTo, + String sort, + boolean descending, + String repositoryId, + int page) { + + PageParameters params = WicketUtils.newRepositoryParameter(""); + if (!StringUtils.isEmpty(query)) { + params.add("q", query); + } + if (!StringUtils.isEmpty(milestone)) { + params.add(Lucene.milestone.name(), milestone); + } + if (!ArrayUtils.isEmpty(states)) { + for (String state : states) { + params.add(Lucene.status.name(), state); + } + } + if (!StringUtils.isEmpty(assignedTo)) { + params.add(Lucene.responsible.name(), assignedTo); + } + if (!StringUtils.isEmpty(sort)) { + params.add("sort", sort); + } + if (!descending) { + params.add("direction", "asc"); + } + if (!StringUtils.isEmpty(repositoryId)) { + params.add(Lucene.rid.name(), repositoryId); + } + if (page > 1) { + params.add("pg", "" + page); + } + return params; + } + + protected void buildPager( + final String query, + final String milestone, + final String [] states, + final String assignedTo, + final String sort, + final boolean desc, + final String repositoryId, + final int page, + int pageSize, + int count, + int total) { + + boolean showNav = total > (2 * pageSize); + boolean allowPrev = page > 1; + boolean allowNext = (pageSize * (page - 1) + count) < total; + add(new BookmarkablePageLink("prevLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repositoryId, page - 1)).setEnabled(allowPrev).setVisible(showNav)); + add(new BookmarkablePageLink("nextLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repositoryId, page + 1)).setEnabled(allowNext).setVisible(showNav)); + + if (total <= pageSize) { + add(new Label("pageLink").setVisible(false)); + return; + } + + // determine page numbers to display + int pages = count == 0 ? 0 : ((total / pageSize) + (total % pageSize == 0 ? 0 : 1)); + // preferred number of pagelinks + int segments = 5; + if (pages < segments) { + // not enough data for preferred number of page links + segments = pages; + } + int minpage = Math.min(Math.max(1, page - 2), pages - (segments - 1)); + int maxpage = Math.min(pages, minpage + (segments - 1)); + List sequence = new ArrayList(); + for (int i = minpage; i <= maxpage; i++) { + sequence.add(i); + } + + ListDataProvider pagesDp = new ListDataProvider(sequence); + DataView pagesView = new DataView("pageLink", pagesDp) { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final Item item) { + final Integer i = item.getModelObject(); + LinkPanel link = new LinkPanel("page", null, "" + i, MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repositoryId, i)); + link.setRenderBodyOnly(true); + if (i == page) { + WicketUtils.setCssClass(item, "active"); + } + item.add(link); + } + }; + add(pagesView); + } + + private QueryBuilder initializeQueryBuilder(String queryparam, String username) { + final QueryBuilder qb = new QueryBuilder(queryparam); + + // focused "my tickets" + if (qb.containsField(Lucene.createdby.name()) + || qb.containsField(Lucene.responsible.name()) + || qb.containsField(Lucene.watchedby.name())) { + + return qb; + } + + // general "my tickets" + return qb.andSubquery() + .or(Lucene.createdby.matches(username)) + .or(Lucene.responsible.matches(username)) + .or(Lucene.watchedby.matches(username)) + .endSubquery(); + } + + private List query(QueryBuilder qb, int page, int pageSize, String sortBy, boolean descending) { + return app().tickets().queryFor(qb.build(), page, pageSize, sortBy, descending); + } + + private List search(String searchParam, int page, int pageSize) { + return app().tickets().searchFor(null, searchParam, page, pageSize); + } + + private List correspondingRepositories(Collection tickets) { + final HashMap result = new HashMap<>(); + for (QueryResult ticket : tickets) { + RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository); + if (!result.containsKey(repository.getRID())) { + result.put(repository.getRID(), repository); + } + } + + return new ArrayList<>(result.values()); + } } -- cgit v1.2.3 From c33ac10581d3ef2c7ec9de4122bd4876ec5db6e9 Mon Sep 17 00:00:00 2001 From: Eddy Young Date: Sat, 23 May 2015 18:50:53 +0100 Subject: Applied changes according to code review comments. Removed default "watchedby" filter so that the default now includes "createdby", "responsible", watchedby" and "mention" --- .../com/gitblit/wicket/pages/MyTicketsPage.java | 25 +++++++++------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'src/main') diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 7b85b141..591c7fef 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -73,12 +73,11 @@ public class MyTicketsPage extends RootPage { } final String username = currentUser.getName(); - final String defaultQueryParam = "watchedby:"+username; 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); - final String queryParam = (params == null || StringUtils.isEmpty(params.getString("q", null))) ? defaultQueryParam : params.getString("q", null); + final String queryParam = (params == null) ? null : 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 repositoryId = (params == null) ? "" : params.getString(Lucene.rid.name(), null); @@ -280,29 +279,22 @@ public class MyTicketsPage extends RootPage { // by repository final List tickets = - query(initializeQueryBuilder(defaultQueryParam, username), 1, Integer.MAX_VALUE, sortBy, desc); + query(initializeQueryBuilder(null, username), 1, Integer.MAX_VALUE, sortBy, desc); final List repositoryChoices = correspondingRepositories(tickets); - Collections.sort(repositoryChoices, new Comparator() { - private static final long serialVersionUID = 1L; - - @Override - public int compare(RepositoryModel repository1, RepositoryModel repository2) { - return repository1.toString().compareTo(repository2.toString()); - } - }); + Collections.sort(repositoryChoices); final RepositoryModel noneChoice = new RepositoryModel(); noneChoice.name = getString("gb.all"); repositoryChoices.add(0, noneChoice); - RepositoryModel currentRepository = repositoryChoices.size() > 0 ? repositoryChoices.get(0) : null; + RepositoryModel currentRepository = repositoryChoices.get(0); for (RepositoryModel r : repositoryChoices) { if (r.getRID().equals(repositoryId)) { currentRepository = r; break; } } - add(new Label("currentRepository", currentRepository == null ? "none" : currentRepository.toString())); + add(new Label("currentRepository", currentRepository.toString())); ListDataProvider repositoryChoicesDp = new ListDataProvider(repositoryChoices); DataView repositoryMenu = new DataView("repository", repositoryChoicesDp) { @@ -311,7 +303,8 @@ public class MyTicketsPage extends RootPage { @Override public void populateItem(final Item item) { final RepositoryModel r = item.getModelObject(); - PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, r.getRID(), 1); + String rid = r == noneChoice ? null : r.getRID(); + PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, rid, 1); item.add(new LinkPanel("repositoryLink", null, r.toString(), MyTicketsPage.class, params).setRenderBodyOnly(true)); } }; @@ -463,7 +456,8 @@ public class MyTicketsPage extends RootPage { // focused "my tickets" if (qb.containsField(Lucene.createdby.name()) || qb.containsField(Lucene.responsible.name()) - || qb.containsField(Lucene.watchedby.name())) { + || qb.containsField(Lucene.watchedby.name()) + || qb.containsField(Lucene.mentions.name())) { return qb; } @@ -473,6 +467,7 @@ public class MyTicketsPage extends RootPage { .or(Lucene.createdby.matches(username)) .or(Lucene.responsible.matches(username)) .or(Lucene.watchedby.matches(username)) + .or(Lucene.mentions.matches(username)) .endSubquery(); } -- cgit v1.2.3