From 531cd203f387f8358a2e15da5f6171f5871ea688 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 20 Apr 2011 20:16:31 -0400 Subject: [PATCH] Support Markdown rendering. Use Wicket GoogleCharts from Maven. --- src/com/gitblit/wicket/panels/HistoryPanel.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.java b/src/com/gitblit/wicket/panels/HistoryPanel.java index 00f4d53..e68fc1a 100644 --- a/src/com/gitblit/wicket/panels/HistoryPanel.java +++ b/src/com/gitblit/wicket/panels/HistoryPanel.java @@ -18,16 +18,19 @@ import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.utils.JGitUtils; +import com.gitblit.utils.JGitUtils.SearchType; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.LinkPanel; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.models.PathModel; +import com.gitblit.wicket.models.PathModel.PathChangeModel; import com.gitblit.wicket.pages.BlobDiffPage; import com.gitblit.wicket.pages.BlobPage; import com.gitblit.wicket.pages.CommitDiffPage; import com.gitblit.wicket.pages.CommitPage; import com.gitblit.wicket.pages.HistoryPage; import com.gitblit.wicket.pages.LogPage; +import com.gitblit.wicket.pages.SearchPage; import com.gitblit.wicket.pages.TreePage; public class HistoryPanel extends BasePanel { @@ -45,7 +48,7 @@ } RevCommit commit = JGitUtils.getCommit(r, objectId); - List<PathModel> paths = JGitUtils.getFilesInCommit(r, commit); + List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, commit); PathModel matchingPath = null; for (PathModel p : paths) { @@ -95,9 +98,12 @@ item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone())); + // author search link String author = entry.getAuthorIdent().getName(); - item.add(WicketUtils.createAuthorLabel("commitAuthor", author)); - + LinkPanel authorLink = new LinkPanel("commitAuthor", "list", author, SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, author, SearchType.AUTHOR)); + setPersonSearchTooltip(authorLink, author, SearchType.AUTHOR); + item.add(authorLink); + String shortMessage = entry.getShortMessage(); String trimmedMessage = StringUtils.trimShortLog(shortMessage); LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())); -- Gitblit v1.9.1