From 4cbddead33232b82a6d35ebfa333e46c74c9bcf8 Mon Sep 17 00:00:00 2001 From: Hybris95 Date: Fri, 25 Apr 2014 14:55:40 +0200 Subject: Added the "you are responsible of" filter in "my tickets" page. --- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 3 ++- src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties | 1 + src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html | 1 + src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java | 9 +++++++++ 4 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index 030c5ebe..89ccaa3d 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -678,4 +678,5 @@ gb.notifyChangedOpenTickets = send notification for changed open tickets 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 75a3ab7a..fc766ce2 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.serverDoesNotAcceptPatchsets = Ce serveur n'accepte pas de patchsets. 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 9ecc4b6e..68b4f045 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 @@
  • +
  • diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java index 7e988a22..00b9e190 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 @@ public class MyTicketsPage extends RootPage { sortBy, desc, 1))); + add(new BookmarkablePageLink("responsibleQuery", MyTicketsPage.class, + queryParameters( + Lucene.responsible.matches(username), + milestoneParam, + statiiParam, + assignedToParam, + sortBy, + desc, + 1))); // states if (ArrayUtils.isEmpty(statiiParam)) { -- cgit v1.2.3