From f11592770694e9d0a391a31fa23f455bc05756c1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 31 Oct 2014 09:22:01 -0400
Subject: [PATCH] Merged #212 "Gracefully handle missing integration branch in ticket page"
---
src/main/java/com/gitblit/wicket/panels/TicketListPanel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
index b4c43cb..2ac33d5 100644
--- a/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TicketListPanel.java
@@ -53,7 +53,7 @@
public class TicketListPanel extends BasePanel {
private static final long serialVersionUID = 1L;
-
+
public TicketListPanel(String wicketId, List<QueryResult> list, final boolean showSwatch, final boolean showRepository) {
super(wicketId);
@@ -83,10 +83,10 @@
item.add(new Label("ticketsLink").setVisible(false));
}
- Label icon = TicketsUI.getStateIcon("state", ticket.type, ticket.status);
+ Label icon = TicketsUI.getStateIcon("state", ticket.type, ticket.status, ticket.severity);
WicketUtils.addCssClass(icon, TicketsUI.getSeverityClass(ticket.severity));
item.add(icon);
-
+
item.add(new Label("id", "" + ticket.number));
UserModel creator = app().users().getUserModel(ticket.createdBy);
if (creator != null) {
@@ -174,7 +174,7 @@
Label priorityIcon = TicketsUI.getPriorityIcon("priority", ticket.priority);
WicketUtils.addCssClass(priorityIcon, TicketsUI.getPriorityClass(ticket.priority));
item.add(priorityIcon.setVisible(true));
-
+
// status indicator
String css = TicketsUI.getLozengeClass(ticket.status, true);
Label l = new Label("status", ticket.status.toString());
--
Gitblit v1.9.1