From 1626c6e7d590a238d02dd8b64fc18e6eea6afbee Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Mar 2014 11:42:34 -0500
Subject: [PATCH] New proposal notifications should include the patchset details
---
src/main/java/com/gitblit/wicket/pages/TicketPage.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index 3eb88dd..3c1dbdf 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -265,7 +265,7 @@
Label label = new Label("progress");
WicketUtils.setCssStyle(label, "width:" + progress + "%;");
milestoneProgress.add(label);
- WicketUtils.setHtmlTooltip(milestoneProgress, MessageFormat.format("{0} open, {1} closed", open, closed));
+ WicketUtils.setHtmlTooltip(milestoneProgress, MessageFormat.format(getString("gb.milestoneProgress"), open, closed));
add(milestoneProgress);
}
@@ -456,7 +456,7 @@
public void onClick(AjaxRequestTarget target) {
TicketMilestone milestone = getModel().getObject();
Change change = new Change(user.username);
- if (NIL.equals(milestone.name)) {
+ if (NIL.equals(milestone.name) || ESC_NIL.equals(milestone.name)) {
change.setField(Field.milestone, "");
} else {
change.setField(Field.milestone, milestone.name);
@@ -895,7 +895,11 @@
break;
}
sb.append("<tr><th style=\"width:70px;\">");
- sb.append(entry.getKey().name());
+ try {
+ sb.append(getString("gb." + entry.getKey().name()));
+ } catch (Exception e) {
+ sb.append(entry.getKey().name());
+ }
sb.append("</th><td>");
sb.append(value);
sb.append("</td></tr>");
--
Gitblit v1.9.1