From 74e73c7f2cd1f0ecc4e65d009e0d8ce2d9160e97 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 25 Mar 2012 18:10:33 -0400
Subject: [PATCH] Corrected timestamp on activity panel from author time to committer time
---
src/com/gitblit/wicket/pages/TicketPage.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TicketPage.java b/src/com/gitblit/wicket/pages/TicketPage.java
index 393d99f..48db1ce 100644
--- a/src/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/com/gitblit/wicket/pages/TicketPage.java
@@ -22,13 +22,12 @@
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.eclipse.jgit.lib.Repository;
-import com.gitblit.utils.JGitUtils;
+import com.gitblit.models.TicketModel;
+import com.gitblit.models.TicketModel.Comment;
import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.TicgitUtils;
import com.gitblit.wicket.GitBlitWebSession;
-import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.models.TicketModel;
-import com.gitblit.wicket.models.TicketModel.Comment;
public class TicketPage extends RepositoryPage {
@@ -38,7 +37,7 @@
final String ticketFolder = WicketUtils.getPath(params);
Repository r = getRepository();
- TicketModel t = JGitUtils.getTicket(r, ticketFolder);
+ TicketModel t = TicgitUtils.getTicket(r, ticketFolder);
add(new Label("ticketTitle", t.title));
add(new Label("ticketId", t.id));
@@ -52,13 +51,15 @@
ListDataProvider<Comment> commentsDp = new ListDataProvider<Comment>(t.comments);
DataView<Comment> commentsView = new DataView<Comment>("comment", commentsDp) {
private static final long serialVersionUID = 1L;
- int counter = 0;
+ int counter;
public void populateItem(final Item<Comment> item) {
final Comment entry = item.getModelObject();
- item.add(WicketUtils.createDateLabel("commentDate", entry.date, GitBlitWebSession.get().getTimezone()));
+ item.add(WicketUtils.createDateLabel("commentDate", entry.date, GitBlitWebSession
+ .get().getTimezone()));
item.add(new Label("commentAuthor", entry.author.toLowerCase()));
- item.add(new Label("commentText", prepareComment(entry.text)).setEscapeModelStrings(false));
+ item.add(new Label("commentText", prepareComment(entry.text))
+ .setEscapeModelStrings(false));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
@@ -74,6 +75,7 @@
private String prepareComment(String comment) {
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>");
+ return html.replaceAll("\\bcommit\\s*([A-Za-z0-9]*)\\b", "<a href=\"/commit/"
+ + repositoryName + "/$1\">commit $1</a>");
}
}
--
Gitblit v1.9.1