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/panels/LogPanel.java | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/LogPanel.java b/src/com/gitblit/wicket/panels/LogPanel.java
index 077ebb9..2075410 100644
--- a/src/com/gitblit/wicket/panels/LogPanel.java
+++ b/src/com/gitblit/wicket/panels/LogPanel.java
@@ -4,10 +4,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
@@ -16,31 +14,35 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
+import com.gitblit.GitBlit;
+import com.gitblit.Keys;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.wicket.GitBlitWebApp;
-import com.gitblit.wicket.GitBlitWebSession;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.pages.CommitDiffPage;
import com.gitblit.wicket.pages.CommitPage;
-import com.gitblit.wicket.pages.DiffPage;
import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TreePage;
-public class LogPanel extends Panel {
+public class LogPanel extends BasePanel {
private static final long serialVersionUID = 1L;
public LogPanel(String wicketId, final String repositoryName, String objectId, Repository r, int limit, int pageOffset) {
super(wicketId);
- boolean pageResults = limit <= 0;
- setOutputMarkupId(pageResults);
-
+ boolean pageResults = limit <= 0;
+ int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.logPageCommitCount, 50);
+ if (itemsPerPage <= 1) {
+ itemsPerPage = 50;
+ }
+
final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);
List<RevCommit> commits;
if (pageResults) {
// Paging result set
- commits = JGitUtils.getRevLog(r, objectId, pageOffset*GitBlitWebApp.PAGING_ITEM_COUNT, GitBlitWebApp.PAGING_ITEM_COUNT);
+ commits = JGitUtils.getRevLog(r, objectId, pageOffset * itemsPerPage, itemsPerPage);
} else {
// Fixed size result set
commits = JGitUtils.getRevLog(r, objectId, 0, limit);
@@ -66,51 +68,41 @@
final RevCommit entry = item.getModelObject();
final Date date = JGitUtils.getCommitDate(entry);
- item.add(WicketUtils.createDateLabel("commitDate", date, GitBlitWebSession.get().getTimezone()));
+ item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone()));
String author = entry.getAuthorIdent().getName();
item.add(WicketUtils.createAuthorLabel("commitAuthor", author));
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);
}
item.add(shortlog);
- item.add(new RefsPanel("commitRefs", entry, allRefs));
+ item.add(new RefsPanel("commitRefs", repositoryName, entry, allRefs));
item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));
- item.add(new BookmarkablePageLink<Void>("diff", DiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));
+ item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));
item.add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
};
- add(logView);
+ add(logView);
// determine to show pager, more, or neither
if (limit <= 0) {
// no display limit
add(new Label("moreLogs", "").setVisible(false));
- add(new Label("pageLogs", "").setVisible(false));
- } else {
+ } else {
if (pageResults) {
// paging
add(new Label("moreLogs", "").setVisible(false));
- if (commits.size() == limit) {
- // show pager
- logView.setItemsPerPage(GitBlitWebApp.PAGING_ITEM_COUNT);
- add(new AjaxPagingNavigator("pageLogs", logView));
- } else {
- // nothing to page
- add(new Label("pageLogs", "").setVisible(false));
- }
} else {
// more
- add(new Label("pageLogs", "").setVisible(false));
if (commits.size() == limit) {
// show more
add(new LinkPanel("moreLogs", "link", new StringResourceModel("gb.moreLogs", this, null), LogPage.class, WicketUtils.newRepositoryParameter(repositoryName)));
--
Gitblit v1.9.1