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 | 419 ++++++++++++++++++++++------------------------------------- 1 files changed, 156 insertions(+), 263 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 32cdaec..ec0648a 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -1,79 +1,90 @@ +/* + * Copyright 2014 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.gitblit.wicket.pages; -import java.io.Serializable; -import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.wicket.Component; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; -import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; -import org.apache.wicket.request.target.basic.RedirectRequestTarget; import com.gitblit.Keys; +import com.gitblit.client.Translation; import com.gitblit.models.RepositoryModel; import com.gitblit.models.TicketModel; -import com.gitblit.models.UserModel; import com.gitblit.models.TicketModel.Status; -import com.gitblit.models.TicketModel.Type; -import com.gitblit.tickets.ITicketService; +import com.gitblit.models.UserModel; import com.gitblit.tickets.QueryBuilder; import com.gitblit.tickets.QueryResult; import com.gitblit.tickets.TicketIndexer.Lucene; import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.StringUtils; -import com.gitblit.wicket.GitBlitWebApp; import com.gitblit.wicket.GitBlitWebSession; -import com.gitblit.wicket.SessionlessForm; +import com.gitblit.wicket.TicketsUI; +import com.gitblit.wicket.TicketsUI.TicketSort; import com.gitblit.wicket.WicketUtils; -import com.gitblit.wicket.panels.GravatarImage; import com.gitblit.wicket.panels.LinkPanel; +import com.gitblit.wicket.panels.TicketListPanel; +import com.gitblit.wicket.panels.TicketSearchForm; +import com.gitblit.wicket.panels.UserTitlePanel; +/** + * My Tickets page + * + * @author Christian Buisson + * @author James Moger + */ public class MyTicketsPage extends RootPage { - public static final String [] openStatii = new String [] { Status.New.name().toLowerCase(), Status.Open.name().toLowerCase() }; - - public static final String [] closedStatii = new String [] { "!" + Status.New.name().toLowerCase(), "!" + Status.Open.name().toLowerCase() }; - - public MyTicketsPage() - { - this(null); + public MyTicketsPage() { + this(null); } - - public MyTicketsPage(PageParameters params) - { + + public MyTicketsPage(PageParameters params) { super(params); - setupPage("", getString("gb.mytickets")); - + setupPage("", getString("gb.myTickets")); + UserModel currentUser = GitBlitWebSession.get().getUser(); - if (currentUser == null) { + if (currentUser == null || UserModel.ANONYMOUS.equals(currentUser)) { setRedirect(true); setResponsePage(getApplication().getHomePage()); return; } - + final String username = currentUser.getName(); - final String[] statiiParam = (params == null) ? openStatii : params.getStringArray(Lucene.status.name()); + 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 repository = (params == null) ? "" : params.getString("repository", 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 - TicketSearchForm searchForm = new TicketSearchForm("ticketSearchForm", searchParam); - add(searchForm); - searchForm.setTranslatedAttributes(); - + add(new TicketSearchForm("ticketSearchForm", null, searchParam, getClass(), params)); + // standard queries add(new BookmarkablePageLink<Void>("changesQuery", MyTicketsPage.class, queryParameters( @@ -83,6 +94,7 @@ assignedToParam, sortBy, desc, + repository, 1))); add(new BookmarkablePageLink<Void>("bugsQuery", MyTicketsPage.class, @@ -93,6 +105,7 @@ assignedToParam, sortBy, desc, + repository, 1))); add(new BookmarkablePageLink<Void>("enhancementsQuery", MyTicketsPage.class, @@ -103,6 +116,7 @@ assignedToParam, sortBy, desc, + repository, 1))); add(new BookmarkablePageLink<Void>("tasksQuery", MyTicketsPage.class, @@ -113,6 +127,7 @@ assignedToParam, sortBy, desc, + repository, 1))); add(new BookmarkablePageLink<Void>("questionsQuery", MyTicketsPage.class, @@ -123,16 +138,29 @@ assignedToParam, sortBy, desc, + repository, + 1))); + + add(new BookmarkablePageLink<Void>("maintenanceQuery", MyTicketsPage.class, + queryParameters( + Lucene.type.matches(TicketModel.Type.Maintenance.name()), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + repository, 1))); add(new BookmarkablePageLink<Void>("resetQuery", MyTicketsPage.class, queryParameters( null, milestoneParam, - openStatii, + TicketsUI.openStatii, null, null, true, + null, 1))); add(new Label("userDivider")); @@ -144,6 +172,7 @@ assignedToParam, sortBy, desc, + repository, 1))); add(new BookmarkablePageLink<Void>("watchedQuery", MyTicketsPage.class, @@ -154,6 +183,7 @@ assignedToParam, sortBy, desc, + repository, 1))); add(new BookmarkablePageLink<Void>("mentionsQuery", MyTicketsPage.class, queryParameters( @@ -163,18 +193,29 @@ assignedToParam, sortBy, desc, + repository, 1))); - + add(new BookmarkablePageLink<Void>("responsibleQuery", MyTicketsPage.class, + queryParameters( + Lucene.responsible.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + repository, + 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<Void>("openTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, openStatii, assignedToParam, sortBy, desc, 1))); - add(new BookmarkablePageLink<Void>("closedTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, closedStatii, assignedToParam, sortBy, desc, 1))); - add(new BookmarkablePageLink<Void>("allTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, 1))); - + add(new BookmarkablePageLink<Void>("openTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.openStatii, assignedToParam, sortBy, desc, repository, 1))); + add(new BookmarkablePageLink<Void>("closedTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, TicketsUI.closedStatii, assignedToParam, sortBy, desc, repository, 1))); + add(new BookmarkablePageLink<Void>("allTickets", MyTicketsPage.class, queryParameters(queryParam, milestoneParam, null, assignedToParam, sortBy, desc, repository, 1))); + // by status List<Status> statii = new ArrayList<Status>(Arrays.asList(Status.values())); statii.remove(Status.Closed); @@ -185,13 +226,14 @@ @Override public void populateItem(final Item<Status> item) { final Status status = item.getModelObject(); - PageParameters p = queryParameters(queryParam, milestoneParam, new String [] { status.name().toLowerCase() }, assignedToParam, sortBy, desc, 1); - String css = getStatusClass(status); + PageParameters p = queryParameters(queryParam, milestoneParam, new String [] { status.name().toLowerCase() }, assignedToParam, sortBy, desc, repository, 1); + String css = TicketsUI.getStatusClass(status); item.add(new LinkPanel("statusLink", css, status.toString(), MyTicketsPage.class, p).setRenderBodyOnly(true)); } }; add(statiiLinks); + // by sort List<TicketSort> sortChoices = new ArrayList<TicketSort>(); sortChoices.add(new TicketSort(getString("gb.sortNewest"), Lucene.created.name(), true)); sortChoices.add(new TicketSort(getString("gb.sortOldest"), Lucene.created.name(), false)); @@ -203,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) { @@ -220,22 +266,41 @@ @Override public void populateItem(final Item<TicketSort> item) { final TicketSort ts = item.getModelObject(); - PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, ts.sortBy, ts.desc, 1); + PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, ts.sortBy, ts.desc, repository, 1); item.add(new LinkPanel("sortLink", null, ts.name, MyTicketsPage.class, params).setRenderBodyOnly(true)); } }; add(sortMenu); - + + // by repository + 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)) { + currentRepository = r; + break; + } + } + add(new Label("currentRepository", currentRepository == null ? "none" : currentRepository.toString())); + + ListDataProvider<RepositoryModel> repositoryChoicesDp = new ListDataProvider<RepositoryModel>(repositoryChoices); + DataView<RepositoryModel> repositoryMenu = new DataView<RepositoryModel>("repository", repositoryChoicesDp) { + private static final long serialVersionUID = 1L; + + @Override + public void populateItem(final Item<RepositoryModel> item) { + final RepositoryModel r = item.getModelObject(); + PageParameters params = queryParameters(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, r.name, 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.responsible.name())) { - // specify the responsible - qb.and(Lucene.responsible.matches(assignedToParam)); - } - if (!qb.containsField(Lucene.milestone.name())) { - // specify the milestone - qb.and(Lucene.milestone.matches(milestoneParam)); - } if (!qb.containsField(Lucene.status.name()) && !ArrayUtils.isEmpty(statiiParam)) { // specify the states boolean not = false; @@ -254,222 +319,45 @@ qb.and(q.toSubquery().toString()); } } - final String luceneQuery = qb.build(); - + + 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()) + || 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); - - ITicketService tickets = GitBlitWebApp.get().tickets(); + List<QueryResult> results; - if(StringUtils.isEmpty(searchParam)) - { - results = tickets.queryFor(luceneQuery, page, pageSize, sortBy, desc); + if(StringUtils.isEmpty(searchParam)) { + results = app().tickets().queryFor(luceneQuery, page, pageSize, sortBy, desc); + } else { + results = app().tickets().searchFor(null, searchParam, page, pageSize); } - else - { - results = tickets.searchFor(null, searchParam, page, pageSize); - } + int totalResults = results.size() == 0 ? 0 : results.get(0).totalResults; - buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, page, pageSize, results.size(), totalResults); - - final ListDataProvider<QueryResult> dp = new ListDataProvider<QueryResult>(results); - - DataView<QueryResult> dataView = new DataView<QueryResult>("row", dp) { - private static final long serialVersionUID = 1L; + buildPager(queryParam, milestoneParam, statiiParam, assignedToParam, sortBy, desc, repository, page, pageSize, results.size(), totalResults); - @Override - protected void populateItem(Item<QueryResult> item) { - QueryResult ticket = item.getModelObject(); - RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository); - - Component swatch = new Label("repositorySwatch", " ").setEscapeModelStrings(false); - WicketUtils.setCssBackground(swatch, repository.toString()); - item.add(swatch); - - PageParameters rp = WicketUtils.newRepositoryParameter(ticket.repository); - PageParameters tp = WicketUtils.newObjectParameter(ticket.repository, "" + ticket.number); - item.add(new LinkPanel("repositoryName", "list", StringUtils.stripDotGit(ticket.repository), SummaryPage.class, rp)); - - item.add(getStateIcon("ticketIcon", ticket.type, ticket.status)); - item.add(new Label("ticketNumber", "" + ticket.number)); - item.add(new LinkPanel("ticketTitle", "list", ticket.title, TicketsPage.class, tp)); - - // votes indicator - Label v = new Label("ticketVotes", "" + ticket.votesCount); - WicketUtils.setHtmlTooltip(v, getString("gb.votes")); - item.add(v.setVisible(ticket.votesCount > 0)); - - Label ticketStatus = new Label("ticketStatus", ticket.status.toString()); - String statusClass = getStatusClass(ticket.status); - WicketUtils.setCssClass(ticketStatus, statusClass); - item.add(ticketStatus); - - UserModel responsible = app().users().getUserModel(ticket.responsible); - if (responsible == null) { - if (ticket.responsible == null) { - item.add(new Label("ticketResponsibleImg").setVisible(false)); - } else { - item.add(new GravatarImage("ticketResponsibleImg", ticket.responsible, ticket.responsible, null, 16, true)); - } - item.add(new Label("ticketResponsible", ticket.responsible)); - } else { - item.add(new GravatarImage("ticketResponsibleImg", responsible, null, 16, true)); - item.add(new LinkPanel("ticketResponsible", null, responsible.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(ticket.responsible))); - } - } - }; - - add(dataView); - } - - protected Label getStateIcon(String wicketId, TicketModel ticket) { - return getStateIcon(wicketId, ticket.type, ticket.status); - } - - protected Label getStateIcon(String wicketId, Type type, Status state) { - Label label = new Label(wicketId); - if (type == null) { - type = Type.defaultType; - } - switch (type) { - case Proposal: - WicketUtils.setCssClass(label, "fa fa-code-fork"); - break; - case Bug: - WicketUtils.setCssClass(label, "fa fa-bug"); - break; - case Enhancement: - WicketUtils.setCssClass(label, "fa fa-magic"); - break; - case Question: - WicketUtils.setCssClass(label, "fa fa-question"); - break; - default: - // standard ticket - WicketUtils.setCssClass(label, "fa fa-ticket"); - } - WicketUtils.setHtmlTooltip(label, getTypeState(type, state)); - return label; - } - - protected String getTypeState(Type type, Status state) { - return state.toString() + " " + type.toString(); - } - - protected String getLozengeClass(Status status, boolean subtle) { - if (status == null) { - status = Status.New; - } - String css = ""; - switch (status) { - case Declined: - case Duplicate: - case Invalid: - case Wontfix: - case Abandoned: - css = "aui-lozenge-error"; - break; - case Fixed: - case Merged: - case Resolved: - css = "aui-lozenge-success"; - break; - case New: - css = "aui-lozenge-complete"; - break; - case On_Hold: - css = "aui-lozenge-current"; - break; - default: - css = ""; - break; - } - - return "aui-lozenge" + (subtle ? " aui-lozenge-subtle": "") + (css.isEmpty() ? "" : " ") + css; - } - - protected String getStatusClass(Status status) { - String css = ""; - switch (status) { - case Declined: - case Duplicate: - case Invalid: - case Wontfix: - case Abandoned: - css = "resolution-error"; - break; - case Fixed: - case Merged: - case Resolved: - css = "resolution-success"; - break; - case New: - css = "resolution-complete"; - break; - case On_Hold: - css = "resolution-current"; - break; - default: - css = ""; - break; - } - - return "resolution" + (css.isEmpty() ? "" : " ") + css; - } - - private class TicketSort implements Serializable { - - private static final long serialVersionUID = 1L; - - final String name; - final String sortBy; - final boolean desc; - - TicketSort(String name, String sortBy, boolean desc) { - this.name = name; - this.sortBy = sortBy; - this.desc = desc; - } - } - - private class TicketSearchForm extends SessionlessForm<Void> implements Serializable { - private static final long serialVersionUID = 1L; - - private final IModel<String> searchBoxModel;; - - public TicketSearchForm(String id, String text) { - super(id, MyTicketsPage.this.getClass(), MyTicketsPage.this.getPageParameters()); - - this.searchBoxModel = new Model<String>(text == null ? "" : text); - - TextField<String> searchBox = new TextField<String>("ticketSearchBox", searchBoxModel); - add(searchBox); - } - - void setTranslatedAttributes() { - WicketUtils.setHtmlTooltip(get("ticketSearchBox"), - MessageFormat.format(getString("gb.searchTicketsTooltip"), "")); - WicketUtils.setInputPlaceholder(get("ticketSearchBox"), getString("gb.searchTickets")); - } - - @Override - public void onSubmit() { - String searchString = searchBoxModel.getObject(); - if (StringUtils.isEmpty(searchString)) { - // redirect to self to avoid wicket page update bug - String absoluteUrl = getCanonicalUrl(); - getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl)); - return; - } - - // use an absolute url to workaround Wicket-Tomcat problems with - // mounted url parameters (issue-111) - PageParameters params = WicketUtils.newRepositoryParameter(""); - params.add("s", searchString); - String absoluteUrl = getCanonicalUrl(MyTicketsPage.class, params); - getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl)); - } + final boolean showSwatch = app().settings().getBoolean(Keys.web.repositoryListSwatches, true); + add(new TicketListPanel("ticketList", results, showSwatch, true)); } protected PageParameters queryParameters( @@ -479,6 +367,7 @@ String assignedTo, String sort, boolean descending, + String repository, int page) { PageParameters params = WicketUtils.newRepositoryParameter(""); @@ -502,6 +391,9 @@ if (!descending) { params.add("direction", "asc"); } + if (!StringUtils.isEmpty(repository)) { + params.add(Lucene.repository.name(), repository); + } if (page > 1) { params.add("pg", "" + page); } @@ -515,6 +407,7 @@ final String assignedTo, final String sort, final boolean desc, + final String repository, final int page, int pageSize, int count, @@ -523,8 +416,8 @@ boolean showNav = total > (2 * pageSize); boolean allowPrev = page > 1; boolean allowNext = (pageSize * (page - 1) + count) < total; - add(new BookmarkablePageLink<Void>("prevLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, page - 1)).setEnabled(allowPrev).setVisible(showNav)); - add(new BookmarkablePageLink<Void>("nextLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, page + 1)).setEnabled(allowNext).setVisible(showNav)); + add(new BookmarkablePageLink<Void>("prevLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repository, page - 1)).setEnabled(allowPrev).setVisible(showNav)); + add(new BookmarkablePageLink<Void>("nextLink", MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repository, page + 1)).setEnabled(allowNext).setVisible(showNav)); if (total <= pageSize) { add(new Label("pageLink").setVisible(false)); @@ -553,7 +446,7 @@ @Override public void populateItem(final Item<Integer> item) { final Integer i = item.getModelObject(); - LinkPanel link = new LinkPanel("page", null, "" + i, MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, i)); + LinkPanel link = new LinkPanel("page", null, "" + i, MyTicketsPage.class, queryParameters(query, milestone, states, assignedTo, sort, desc, repository, i)); link.setRenderBodyOnly(true); if (i == page) { WicketUtils.setCssClass(item, "active"); -- Gitblit v1.9.1