From 072643f0b4b808d7fdf4cb73c65045e3b034dad8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 15 Apr 2011 17:32:28 -0400
Subject: [PATCH] Show commit parents on separate lines. "tagger" instead of "author".
---
src/com/gitblit/wicket/pages/TicGitTicketPage.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TicGitTicketPage.java b/src/com/gitblit/wicket/pages/TicGitTicketPage.java
index fdd6ea0..b4c9cf5 100644
--- a/src/com/gitblit/wicket/pages/TicGitTicketPage.java
+++ b/src/com/gitblit/wicket/pages/TicGitTicketPage.java
@@ -8,6 +8,7 @@
import org.eclipse.jgit.lib.Repository;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
@@ -26,12 +27,12 @@
add(new Label("ticketTitle", t.title));
add(new Label("ticketId", t.id));
- add(new Label("ticketHandler", t.handler));
- add(WicketUtils.createTimestampLabel("ticketOpendate", t.date, getTimeZone()));
+ add(new Label("ticketHandler", t.handler.toLowerCase()));
+ add(WicketUtils.createTimestampLabel("ticketOpenDate", t.date, getTimeZone()));
Label stateLabel = new Label("ticketState", t.state);
WicketUtils.setTicketCssClass(stateLabel, t.state);
add(stateLabel);
- add(new Label("ticketTags", WicketUtils.flattenStrings(t.tags)));
+ add(new Label("ticketTags", StringUtils.flattenStrings(t.tags)));
ListDataProvider<Comment> commentsDp = new ListDataProvider<Comment>(t.comments);
DataView<Comment> commentsView = new DataView<Comment>("comment", commentsDp) {
@@ -41,7 +42,7 @@
public void populateItem(final Item<Comment> item) {
final Comment entry = item.getModelObject();
item.add(WicketUtils.createDateLabel("commentDate", entry.date, GitBlitWebSession.get().getTimezone()));
- item.add(new Label("commentAuthor", entry.author));
+ item.add(new Label("commentAuthor", entry.author.toLowerCase()));
item.add(new Label("commentText", prepareComment(entry.text)).setEscapeModelStrings(false));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
@@ -49,14 +50,15 @@
};
add(commentsView);
}
-
+
@Override
protected String getPageName() {
return getString("gb.ticket");
}
private String prepareComment(String comment) {
- String html = WicketUtils.breakLines(comment).trim();
+ String html = StringUtils.escapeForHtml(comment, false);
+ html = StringUtils.breakLinesForHtml(comment).trim();
return html.replaceAll("\\bcommit\\s*([A-Za-z0-9]*)\\b", "<a href=\"/commit/" + repositoryName + "/$1\">commit $1</a>");
}
}
--
Gitblit v1.9.1