The Unified and Autonomous Development Platform
Fix the issue that markdown preview is not rendering when save issue and encounter error
Robin Shen7e7cc9c58fe6
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 4907a77990..5cd1d1a21d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -660,22 +660,24 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessionalprotected void checkAsync(Collection<PullRequest> requests) {Collection<Long> requestIds = requests.stream().map(it->it.getId()).collect(Collectors.toList());- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- dao.getSessionManager().runAsync(new Runnable() {-- @Override- public void run() {- for (Long requestId: requestIds)- check(load(requestId));- }-- }, SecurityUtils.getSubject());- }-- });+ if (!requestIds.isEmpty()) {+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ dao.getSessionManager().runAsync(new Runnable() {++ @Override+ public void run() {+ for (Long requestId: requestIds)+ check(load(requestId));+ }++ }, SecurityUtils.getSubject());+ }++ });+ }}@Transactionaldiff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex 085fe681a9..f0e1ce4116 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -32,6 +32,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;@@ -165,7 +166,14 @@ public class MarkdownEditor extends FormComponentPanel<String> {if (initialSplit) {container.add(AttributeAppender.append("class", "split-mode"));- preview.add(new Label("rendered", renderInput(getModelObject())) {+ preview.add(new Label("rendered", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return renderInput(input.getConvertedInput());+ }++ }) {@Overridepublic void renderHead(IHeaderResponse response) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex 79a47bff5a..d49f3f30b1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -102,7 +102,6 @@ onedev.server.markdown = {$splitLink.addClass("active");onLayoutChange();callback("render", $input.val());- console.log(onedev.server.markdown.getCookiePrefix($container)+".split");Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".split", true, {expires: Infinity});});