Skip to content

The Unified and Autonomous Development Platform

fix issue #16: Comment preview is not cleared

Robin Shene246da5ee6a6
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index 23550d6d63..86b3716c80 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -275,8 +275,8 @@ public abstract class IssueActivitiesPanel extends Panel {
comment.setIssue(getIssue());
OneDev.getInstance(IssueCommentManager.class).save(comment);
- input.setModelObject("");
-
+ input.clearMarkdown();
+
@SuppressWarnings("deprecation")
Component lastActivityRow = activitiesView.get(activitiesView.size()-1);
Component newActivityRow = newActivityRow(activitiesView.newChildId(), new IssueCommentedActivity(comment));
diff --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.java
index be7325c75c..670d970c96 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
@@ -113,6 +113,11 @@ public class MarkdownEditor extends FormComponentPanel<String> {
super.onModelChanged();
input.setModelObject(getModelObject());
}
+
+ public void clearMarkdown() {
+ setModelObject("");
+ input.setConvertedInput(null);
+ }
private String renderInput(String input) {
if (StringUtils.isNotBlank(input)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 4cb94a2a7f..e15f2e2b4f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -427,7 +427,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
comment.setUser(getLoginUser());
comment.setContent(input.getModelObject());
OneDev.getInstance(PullRequestCommentManager.class).save(comment);
- input.setModelObject("");
+ input.clearMarkdown();
target.add(fragment);