diff options
author | Paul Martin <paul@paulsputer.com> | 2016-04-29 22:39:46 +0100 |
---|---|---|
committer | Paul Martin <paul@paulsputer.com> | 2016-04-29 22:39:46 +0100 |
commit | 811cf093827e31f7ece5d2b24c56f2dd9cc800de (patch) | |
tree | cf861cf225394d66f2c93da0ace8ebb330c444be /src/main/java | |
parent | b753682ec04c89c8ebb5b451d7d82661ffa31391 (diff) | |
download | gitblit-811cf093827e31f7ece5d2b24c56f2dd9cc800de.tar.gz gitblit-811cf093827e31f7ece5d2b24c56f2dd9cc800de.zip |
Fixes #1062 - Upgraded to Prosemirror 0.6.1
Diffstat (limited to 'src/main/java')
-rw-r--r-- | 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 00375373..dbf8a79e 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 @@ public class EditFilePage extends RepositoryPage { 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 @@ public class EditFilePage extends RepositoryPage { } else { + MarkupDocument markupDoc = processor.parse(repositoryName, displayedCommitId, documentPath, markupText); final Model<String> documentContent = new Model<String>(markupDoc.html); fragment = new Fragment("doc", "plainContent", this); |