From 6b5c2c817e8ed812f7eee433466392255538f293 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 11 Sep 2014 10:49:02 -0400
Subject: [PATCH] Merge branch 'ticket/176' into develop
---
src/main/java/com/gitblit/wicket/pages/DocsPage.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/DocsPage.java b/src/main/java/com/gitblit/wicket/pages/DocsPage.java
index a3d0f21..97b1604 100644
--- a/src/main/java/com/gitblit/wicket/pages/DocsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DocsPage.java
@@ -49,11 +49,14 @@
public DocsPage(PageParameters params) {
super(params);
+ String objectId = WicketUtils.getObject(params);
+
MarkupProcessor processor = new MarkupProcessor(app().settings(), app().xssFilter());
Repository r = getRepository();
- RevCommit head = JGitUtils.getCommit(r, null);
+ RevCommit head = JGitUtils.getCommit(r, objectId);
final String commitId = getBestCommitId(head);
+
List<String> extensions = processor.getAllExtensions();
List<PathModel> paths = JGitUtils.getDocuments(r, extensions);
@@ -127,7 +130,6 @@
}
// document list
- final String id = getBestCommitId(head);
final ByteFormat byteFormat = new ByteFormat();
Fragment docs = new Fragment("documents", "documentsFragment", this);
ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);
@@ -141,17 +143,17 @@
item.add(WicketUtils.newImage("docIcon", "file_world_16x16.png"));
item.add(new Label("docSize", byteFormat.format(entry.size)));
item.add(new LinkPanel("docName", "list", StringUtils.stripFileExtension(entry.name),
- DocPage.class, WicketUtils.newPathParameter(repositoryName, id, entry.path)));
+ DocPage.class, WicketUtils.newPathParameter(repositoryName, commitId, entry.path)));
// links
item.add(new BookmarkablePageLink<Void>("view", DocPage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
- String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, id, entry.path);
+ .newPathParameter(repositoryName, commitId, entry.path)));
+ String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, commitId, entry.path);
item.add(new ExternalLink("raw", rawUrl));
item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
+ .newPathParameter(repositoryName, commitId, entry.path)));
item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
- .newPathParameter(repositoryName, id, entry.path)));
+ .newPathParameter(repositoryName, commitId, entry.path)));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
--
Gitblit v1.9.1