From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/wicket/pages/EditFilePage.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditFilePage.java b/src/main/java/com/gitblit/wicket/pages/EditFilePage.java
index 0037537..dbf8a79 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditFilePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditFilePage.java
@@ -96,12 +96,10 @@
Fragment fragment;
String displayedCommitId = commit.getId().getName();
- MarkupDocument markupDoc = processor.parse(repositoryName, displayedCommitId, documentPath, markupText);
- logger.trace("Loading Edit File page: " + displayedCommitId);
if (currentUser.canEdit(getRepositoryModel()) && JGitUtils.isTip(getRepository(), objectId.toString())) {
- final Model<String> documentContent = new Model<String>(markupDoc.markup);
+ final Model<String> documentContent = new Model<String>(markupText);
final Model<String> commitMessage = new Model<String>("Document update");
final Model<String> commitIdAtLoad = new Model<String>(displayedCommitId);
@@ -181,6 +179,7 @@
} else {
+ MarkupDocument markupDoc = processor.parse(repositoryName, displayedCommitId, documentPath, markupText);
final Model<String> documentContent = new Model<String>(markupDoc.html);
fragment = new Fragment("doc", "plainContent", this);
--
Gitblit v1.9.1