From 331fbc638684c605d90d49269202dde071db10c4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 20 Jul 2011 16:03:07 -0400
Subject: [PATCH] Cancel buttons on edit pages. Column fix for flat repositories view.
---
src/com/gitblit/wicket/pages/MarkdownPage.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/MarkdownPage.java b/src/com/gitblit/wicket/pages/MarkdownPage.java
index fc8b7cb..aaf12ba 100644
--- a/src/com/gitblit/wicket/pages/MarkdownPage.java
+++ b/src/com/gitblit/wicket/pages/MarkdownPage.java
@@ -39,7 +39,8 @@
RevCommit commit = JGitUtils.getCommit(r, objectId);
// markdown page links
- add(new Label("blameLink", getString("gb.blame")));
+ add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,
+ WicketUtils.newPathParameter(repositoryName, objectId, markdownPath)));
add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,
WicketUtils.newPathParameter(repositoryName, objectId, markdownPath)));
add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(
@@ -48,7 +49,7 @@
WicketUtils.newPathParameter(repositoryName, Constants.HEAD, markdownPath)));
// Read raw markdown content and transform it to html
- String markdownText = JGitUtils.getRawContentAsString(r, commit, markdownPath);
+ String markdownText = JGitUtils.getStringContent(r, commit.getTree(), markdownPath);
String htmlText;
try {
htmlText = MarkdownUtils.transformMarkdown(markdownText);
--
Gitblit v1.9.1