From 4cbddead33232b82a6d35ebfa333e46c74c9bcf8 Mon Sep 17 00:00:00 2001 From: Hybris95 <hybris_95@hotmail.com> Date: Thu, 01 May 2014 16:14:15 -0400 Subject: [PATCH] Added the "you are responsible of" filter in "my tickets" page. --- src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html | 1 + src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties | 1 + src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 3 ++- src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java | 9 +++++++++ 4 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index 030c5eb..89ccaa3 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -678,4 +678,5 @@ gb.overdue = overdue gb.openMilestones = open milestones gb.closedMilestones = closed milestones -gb.mytickets = my tickets \ No newline at end of file +gb.mytickets = my tickets +gb.responsibleMeTickets = you are responsible of \ No newline at end of file diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties index 75a3ab7..fc766ce 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties @@ -671,3 +671,4 @@ gb.ticketIsClosed = Ce ticket est clos. gb.mergeToDescription = default integration branch for merging ticket patchsets gb.mytickets = mes tickets +gb.responsibleMeTickets = dont vous �tes responsable diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index 9ecc4b6..68b4f04 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -33,6 +33,7 @@ <li><a wicket:id="createdQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li> <li><a wicket:id="watchedQuery"><i class="fa fa-eye"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li> <li><a wicket:id="mentionsQuery"><i class="fa fa-comment"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li> + <li><a wicket:id="responsibleQuery"><i class="fa fa-user"></i> <wicket:message key="gb.responsibleMeTickets"></wicket:message></a></li> <li class="divider"></li> <li><a wicket:id="resetQuery"><i class="fa fa-bolt"></i> <wicket:message key="gb.reset"></wicket:message></a></li> </ul> diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 7e988a2..00b9e19 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java @@ -172,6 +172,15 @@ sortBy, desc, 1))); + add(new BookmarkablePageLink<Void>("responsibleQuery", MyTicketsPage.class, + queryParameters( + Lucene.responsible.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); // states if (ArrayUtils.isEmpty(statiiParam)) { -- Gitblit v1.9.1