From b41754563a8318ae8840574261c503bbf4e7e413 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 02 May 2014 16:09:55 -0400
Subject: [PATCH] Change My Tickets repository link to the repository tickets page
---
src/main/java/com/gitblit/wicket/panels/TicketListPanel.html | 2 +-
src/main/java/com/gitblit/wicket/panels/TicketListPanel.java | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.html b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.html
index 6e6d209..30f5036 100644
--- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.html
@@ -22,7 +22,7 @@
<span wicket:id="indicators" style="white-space:nowrap;"><i wicket:id="icon"></i> <span style="padding-right:10px;" wicket:id="count"></span></span>
</div>
<div class="hidden-phone" wicket:id="updated"></div>
- <div class="ticket-list-details"><span class="activitySwatch" wicket:id="repositoryLink">[repository link]</span></div>
+ <div class="ticket-list-details"><span class="activitySwatch" wicket:id="ticketsLink">[tickets link]</span></div>
</td>
<td class="ticket-list-state">
<span class="badge badge-info" wicket:id="votes"></span>
diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
index fc0431f..395200c 100644
--- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
@@ -32,6 +32,7 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.tickets.QueryResult;
+import com.gitblit.tickets.TicketIndexer.Lucene;
import com.gitblit.tickets.TicketLabel;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.BugtraqProcessor;
@@ -40,7 +41,6 @@
import com.gitblit.wicket.TicketsUI;
import com.gitblit.wicket.TicketsUI.Indicator;
import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TicketsPage;
import com.gitblit.wicket.pages.UserPage;
@@ -73,16 +73,19 @@
WicketUtils.setCssStyle(item, MessageFormat.format("border-left: 2px solid {0};", color));
}
- PageParameters rp = WicketUtils.newRepositoryParameter(ticket.repository);
PageParameters tp = WicketUtils.newObjectParameter(ticket.repository, "" + ticket.number);
if (showRepository) {
String name = StringUtils.stripDotGit(ticket.repository);
- LinkPanel link = new LinkPanel("repositoryLink", null, name, SummaryPage.class, rp);
+ PageParameters rp = new PageParameters(WicketUtils.newRepositoryParameter(ticket.repository));
+ for (String state : TicketsUI.openStatii) {
+ rp.add(Lucene.status.name(), state);
+ }
+ LinkPanel link = new LinkPanel("ticketsLink", null, name, TicketsPage.class, rp);
WicketUtils.setCssBackground(link, name);
item.add(link);
} else {
- item.add(new Label("repositoryLink").setVisible(false));
+ item.add(new Label("ticketsLink").setVisible(false));
}
item.add(TicketsUI.getStateIcon("state", ticket.type, ticket.status));
--
Gitblit v1.9.1