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/LogPanel.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/LogPanel.java b/src/com/gitblit/wicket/panels/LogPanel.java
index 8ef1e3e..0457511 100644
--- a/src/com/gitblit/wicket/panels/LogPanel.java
+++ b/src/com/gitblit/wicket/panels/LogPanel.java
@@ -14,24 +14,30 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitblit.StoredSettings;
+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.pages.CommitPage;
import com.gitblit.wicket.pages.CommitDiffPage;
+import com.gitblit.wicket.pages.CommitPage;
import com.gitblit.wicket.pages.LogPage;
+import com.gitblit.wicket.pages.SearchPage;
import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TreePage;
public class LogPanel extends BasePanel {
private static final long serialVersionUID = 1L;
+
+ private boolean hasMore = false;
- public LogPanel(String wicketId, final String repositoryName, String objectId, Repository r, int limit, int pageOffset) {
+ public LogPanel(String wicketId, final String repositoryName, final String objectId, Repository r, int limit, int pageOffset) {
super(wicketId);
boolean pageResults = limit <= 0;
- int itemsPerPage = StoredSettings.getInteger("logPageCommitCount", 50);
+ int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.logPageCommitCount, 50);
if (itemsPerPage <= 1) {
itemsPerPage = 50;
}
@@ -45,6 +51,10 @@
// Fixed size result set
commits = JGitUtils.getRevLog(r, objectId, 0, limit);
}
+
+ // inaccurate way to determine if there are more commits.
+ // works unless commits.size() represents the exact end.
+ hasMore = commits.size() >= itemsPerPage;
// header
if (pageResults) {
@@ -68,11 +78,14 @@
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 = WicketUtils.trimShortLog(shortMessage);
+ String trimmedMessage = StringUtils.trimShortLog(shortMessage);
LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()));
if (!shortMessage.equals(trimmedMessage)) {
WicketUtils.setHtmlTitle(shortlog, shortMessage);
@@ -111,4 +124,8 @@
}
}
}
+
+ public boolean hasMore() {
+ return hasMore;
+ }
}
--
Gitblit v1.9.1