From e5cb554318f2be8c288789e47f80beb242f3cea6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 23 Feb 2012 17:06:46 -0500
Subject: [PATCH] Fixed UTF-8 encoding bug in diff formatter (issue 66)
---
src/com/gitblit/wicket/panels/ActivityPanel.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java
index e9ec074..4548619 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -29,7 +29,6 @@
import com.gitblit.models.Activity.RepositoryCommit;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
-import com.gitblit.wicket.GravatarImage;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitDiffPage;
import com.gitblit.wicket.pages.CommitPage;
@@ -59,8 +58,7 @@
public void populateItem(final Item<Activity> item) {
final Activity entry = item.getModelObject();
- item.add(WicketUtils.createDatestampLabel("title", entry.startDate, GitBlitWebSession
- .get().getTimezone()));
+ item.add(WicketUtils.createDatestampLabel("title", entry.startDate, getTimeZone()));
// display the commits in chronological order
DataView<RepositoryCommit> commits = new DataView<RepositoryCommit>("commits",
@@ -73,7 +71,7 @@
// time of day
fragment.add(WicketUtils.createTimeLabel("time", commit.getAuthorIdent()
- .getWhen(), GitBlitWebSession.get().getTimezone()));
+ .getWhen(), getTimeZone()));
// avatar
fragment.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36));
@@ -90,27 +88,28 @@
String author = commit.getAuthorIdent().getName();
LinkPanel authorLink = new LinkPanel("author", "list", author,
SearchPage.class, WicketUtils.newSearchParameter(commit.repository,
- commit.getName(), author, Constants.SearchType.AUTHOR));
+ commit.getName(), author, Constants.SearchType.AUTHOR), true);
setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);
fragment.add(authorLink);
// repository
+ String repoName = StringUtils.stripDotGit(commit.repository);
LinkPanel repositoryLink = new LinkPanel("repository", null,
- commit.repository, SummaryPage.class,
- WicketUtils.newRepositoryParameter(commit.repository));
- WicketUtils.setCssBackground(repositoryLink, commit.repository);
+ repoName, SummaryPage.class,
+ WicketUtils.newRepositoryParameter(commit.repository), true);
+ WicketUtils.setCssBackground(repositoryLink, repoName);
fragment.add(repositoryLink);
// repository branch
LinkPanel branchLink = new LinkPanel("branch", "list", commit.branch,
LogPage.class, WicketUtils.newObjectParameter(commit.repository,
- commit.branch));
+ commit.branch), true);
WicketUtils.setCssStyle(branchLink, "color: #008000;");
fragment.add(branchLink);
LinkPanel commitid = new LinkPanel("commitid", "list subject",
commit.getShortName(), CommitPage.class,
- WicketUtils.newObjectParameter(commit.repository, commit.getName()));
+ WicketUtils.newObjectParameter(commit.repository, commit.getName()), true);
fragment.add(commitid);
// message/commit link
@@ -118,7 +117,7 @@
String trimmedMessage = StringUtils.trimShortLog(shortMessage);
LinkPanel shortlog = new LinkPanel("message", "list subject",
trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(
- commit.repository, commit.getName()));
+ commit.repository, commit.getName()), true);
if (!shortMessage.equals(trimmedMessage)) {
WicketUtils.setHtmlTooltip(shortlog, shortMessage);
}
--
Gitblit v1.9.1