The Unified and Autonomous Development Platform
Fix issue #1181 - Able to quote a reply in issue / pull request comment
Robin Shen8e90f2ddffe7
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.htmlindex 27b48d1bdb..6f8ec76586 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html@@ -17,11 +17,7 @@<div class="body"><div wicket:id="content"></div></div>- <div wicket:id="foot" class="foot d-flex align-items-center font-size-sm mt-3">- <a wicket:id="edit" class="mr-2 text-muted text-hover-primary">Edit</a>- <span class="dot mr-2"></span>- <a wicket:id="delete" class="text-muted text-hover-primary">Delete</a>- </div>+ <div class="foot d-empty-none d-flex align-items-center font-size-sm mt-3"><wicket:enclosure child="edit"><a wicket:id="edit" class="mr-2 text-muted text-hover-primary">Edit</a><span class="dot d-last-child-none mr-2"></span></wicket:enclosure><wicket:enclosure child="quote"><a wicket:id="quote" class="text-muted text-hover-primary mr-2">Quote</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><wicket:enclosure child="delete"><a wicket:id="delete" class="text-muted text-hover-primary mr-2">Delete</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure></div></div></wicket:fragment><wicket:fragment wicket:id="commentOrReplyEditFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex f4e1ae03e3..b149038478 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -8,6 +8,9 @@ import java.util.List;import javax.annotation.Nullable;+import io.onedev.server.web.component.markdown.ContentQuoted;+import io.onedev.server.web.component.markdown.MarkdownEditor;+import io.onedev.server.web.util.WicketUtils;import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -17,6 +20,8 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.behavior.Behavior;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;@@ -59,9 +64,12 @@ import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.markdown.SuggestionSupport;-import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;+import org.unbescape.javascript.JavaScriptEscape;@SuppressWarnings("serial")public abstract class CodeCommentPanel extends Panel {@@ -155,9 +163,7 @@ public abstract class CodeCommentPanel extends Panel {viewFragment.add(new WebMarkupContainer("anchor").setVisible(false));- WebMarkupContainer foot = new WebMarkupContainer("foot");- foot.setVisible(SecurityUtils.canModifyOrDelete(getComment()));- foot.add(new AjaxLink<Void>("edit") {+ viewFragment.add(new AjaxLink<Void>("edit") {@Overridepublic void onClick(AjaxRequestTarget target) {@@ -256,10 +262,30 @@ public abstract class CodeCommentPanel extends Panel {viewFragment.replaceWith(editFragment);target.add(editFragment);}-++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canModifyOrDelete(getComment()));+ }+ });++ viewFragment.add(new AjaxLink<Void>("quote") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ send(getPage(), Broadcast.BREADTH, new ContentQuoted(target, getComment().getContent()));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.getUser() != null);+ }+});- foot.add(new AjaxLink<Void>("delete") {+ viewFragment.add(new AjaxLink<Void>("delete") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -279,10 +305,13 @@ public abstract class CodeCommentPanel extends Panel {onDeleteComment(target, getComment());OneDev.getInstance(CodeCommentManager.class).delete(getComment());}-++ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canModifyOrDelete(getComment()));+ }});- viewFragment.add(foot);return viewFragment;}@@ -460,7 +489,23 @@ public abstract class CodeCommentPanel extends Panel {@Nullableprotected abstract SuggestionSupport getSuggestionSupport();- private void onAddReply(AjaxRequestTarget target, @Nullable Boolean resolved) {+ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof ContentQuoted) {+ ContentQuoted contentQuoted = (ContentQuoted) event.getPayload();+ if (visitChildren(MarkdownEditor.class, new IVisitor<MarkdownEditor, MarkdownEditor>() {+ @Override+ public void component(MarkdownEditor object, IVisit<MarkdownEditor> visit) {+ visit.stop(object);+ }+ }) == null) {+ onAddReply(contentQuoted.getHandler(), null);+ }+ }+ }++ private void onAddReply(IPartialPageRequestHandler handler, @Nullable Boolean resolved) {Fragment editFragment = new Fragment("actions", "commentOrReplyEditFrag", CodeCommentPanel.this);Form<?> form = new Form<Void>("form");@@ -582,14 +627,14 @@ public abstract class CodeCommentPanel extends Panel {editFragment.setOutputMarkupId(true);get("actions").replaceWith(editFragment);- target.add(editFragment);+ handler.add(editFragment);String script = String.format(""+ "setTimeout(function() {"+ " document.getElementById('%s').scrollIntoViewIfNeeded(false);"+ "}, 0);",saveButton.getMarkupId());- target.appendJavaScript(script);+ handler.appendJavaScript(script);}protected abstract void onDeleteComment(AjaxRequestTarget target, CodeComment comment);@@ -755,10 +800,7 @@ public abstract class CodeCommentPanel extends Panel {});- WebMarkupContainer foot = new WebMarkupContainer("foot");- foot.setVisible(SecurityUtils.canModifyOrDelete(reply));-- foot.add(new AjaxLink<Void>("edit") {+ viewFragment.add(new AjaxLink<Void>("edit") {@Overridepublic void onClick(AjaxRequestTarget target) {@@ -852,9 +894,30 @@ public abstract class CodeCommentPanel extends Panel {viewFragment.replaceWith(editFragment);target.add(editFragment);}-++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canModifyOrDelete(getReply()));+ }+ });++ viewFragment.add(new AjaxLink<Void>("quote") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ send(getPage(), Broadcast.BREADTH, new ContentQuoted(target, getReply().getContent()));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.getUser() != null);+ }+});- foot.add(new AjaxLink<Void>("delete") {++ viewFragment.add(new AjaxLink<Void>("delete") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -868,11 +931,14 @@ public abstract class CodeCommentPanel extends Panel {OneDev.getInstance(CodeCommentReplyManager.class).delete(getReply());target.appendJavaScript(String.format("$('#%s').remove();", viewFragment.getMarkupId()));}-++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canModifyOrDelete(getReply()));+ }});- viewFragment.add(foot);-viewFragment.add(AttributeAppender.append("class", "reply"));return viewFragment;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.javarename to server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.javaindex 0a93a08982..cf62cffa3a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.project.comment;+package io.onedev.server.web.component.comment;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.htmlsimilarity index 50%rename from server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.htmlindex bf68e9f489..01f08ca7a4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.html@@ -3,13 +3,7 @@<wicket:fragment wicket:id="viewFrag"><div wicket:id="content"></div><i wicket:id="noContent" class="text-muted"></i>- <div wicket:id="actions" class="mt-3 d-flex align-items-center font-size-sm">- <a wicket:id="edit" class="text-muted text-hover-primary mr-2">Edit</a>- <wicket:enclosure child="delete">- <span class="dot mr-2"></span>- <a wicket:id="delete" class="text-muted text-hover-primary">Delete</a>- </wicket:enclosure>- </div>+ <div class="mt-3 d-empty-none d-flex align-items-center font-size-sm"><wicket:enclosure child="edit"><a wicket:id="edit" class="text-muted text-hover-primary mr-2">Edit</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><wicket:enclosure child="quote"><a wicket:id="quote" class="text-muted text-hover-primary mr-2">Quote</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><wicket:enclosure child="delete"><a wicket:id="delete" class="text-muted text-hover-primary mr-2">Delete</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure></div></wicket:fragment><wicket:fragment wicket:id="editFrag"><form wicket:id="form" class="leave-confirm">diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.javaindex 1df19c9281..77821d76bd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java@@ -1,18 +1,28 @@-package io.onedev.server.web.component.project.comment;--import java.util.ArrayList;-import java.util.List;--import javax.annotation.Nullable;+package io.onedev.server.web.component.comment;+import com.google.common.collect.Sets;+import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.OneDev;+import io.onedev.server.attachment.AttachmentSupport;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.facade.UserCache;+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.component.markdown.ContentQuoted;+import io.onedev.server.web.component.markdown.ContentVersionSupport;+import io.onedev.server.web.component.markdown.MarkdownViewer;+import io.onedev.server.web.util.DeleteCallback;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.event.Broadcast;import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Fragment;@@ -23,20 +33,9 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.hibernate.StaleStateException;-import com.google.common.collect.Sets;--import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.attachment.AttachmentSupport;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.util.facade.UserCache;-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.component.markdown.ContentVersionSupport;-import io.onedev.server.web.component.markdown.MarkdownViewer;-import io.onedev.server.web.util.DeleteCallback;+import javax.annotation.Nullable;+import java.util.ArrayList;+import java.util.List;@SuppressWarnings("serial")public abstract class CommentPanel extends Panel {@@ -100,9 +99,7 @@ public abstract class CommentPanel extends Panel {});- WebMarkupContainer actions = new WebMarkupContainer("actions");- actions.setVisible(canModifyOrDeleteComment());- actions.add(new AjaxLink<Void>("edit") {+ viewer.add(new AjaxLink<Void>("edit") {@Overridepublic void onClick(AjaxRequestTarget target) {@@ -188,9 +185,29 @@ public abstract class CommentPanel extends Panel {target.add(editor);}+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(canManageComment());+ }+ });++ viewer.add(new AjaxLink<Void>("quote") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ send(getPage(), Broadcast.BREADTH, new ContentQuoted(target, getComment()));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.getUser() != null && getComment() != null);+ }+});- actions.add(new AjaxLink<Void>("delete") {+ viewer.add(new AjaxLink<Void>("delete") {@Overrideprotected void updateAjaxAttributes(AjaxRequestAttributes attributes) {@@ -206,12 +223,10 @@ public abstract class CommentPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getDeleteCallback() != null);+ setVisible(canManageComment() && getDeleteCallback() != null);}});-- viewer.add(actions);viewer.setOutputMarkupId(true);return viewer;@@ -237,7 +252,7 @@ public abstract class CommentPanel extends Panel {protected abstract AttachmentSupport getAttachmentSupport();- protected abstract boolean canModifyOrDeleteComment();+ protected abstract boolean canManageComment();@Nullableprotected abstract String getRequiredLabel();diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 452b334990..315aca473f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -104,7 +104,7 @@ import io.onedev.server.web.component.markdown.OutdatedSuggestionException;import io.onedev.server.web.component.markdown.SuggestionSupport;import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;-import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.suggestionapply.SuggestionApplyBean;import io.onedev.server.web.component.suggestionapply.SuggestionApplyModalPanel;import io.onedev.server.web.component.svg.SpriteImage;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.javaindex e7b15f34e1..d5f3985387 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@@ -1,13 +1,27 @@package io.onedev.server.web.component.issue.activities;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Date;-import java.util.List;--import javax.servlet.http.Cookie;-+import com.google.common.collect.Lists;+import io.onedev.server.OneDev;+import io.onedev.server.attachment.AttachmentSupport;+import io.onedev.server.attachment.ProjectAttachmentSupport;+import io.onedev.server.entitymanager.IssueCommentManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.entityreference.ReferencedFromAware;+import io.onedev.server.model.*;import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.facade.UserCache;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.behavior.WebSocketObserver;+import io.onedev.server.web.component.issue.activities.activity.IssueActivity;+import io.onedev.server.web.component.issue.activities.activity.IssueChangeActivity;+import io.onedev.server.web.component.issue.activities.activity.IssueCommentedActivity;+import io.onedev.server.web.component.issue.activities.activity.IssueOpenedActivity;+import io.onedev.server.web.component.comment.CommentInput;+import io.onedev.server.web.component.user.ident.Mode;+import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.page.simple.security.LoginPage;+import io.onedev.server.web.util.DeleteCallback;import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;@@ -32,32 +46,11 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.http.WebResponse;-import com.google.common.collect.Lists;--import io.onedev.server.OneDev;-import io.onedev.server.attachment.AttachmentSupport;-import io.onedev.server.attachment.ProjectAttachmentSupport;-import io.onedev.server.entitymanager.IssueCommentManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.entityreference.ReferencedFromAware;-import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueChange;-import io.onedev.server.model.IssueComment;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.facade.UserCache;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.behavior.WebSocketObserver;-import io.onedev.server.web.component.issue.activities.activity.IssueActivity;-import io.onedev.server.web.component.issue.activities.activity.IssueChangeActivity;-import io.onedev.server.web.component.issue.activities.activity.IssueCommentedActivity;-import io.onedev.server.web.component.issue.activities.activity.IssueOpenedActivity;-import io.onedev.server.web.component.project.comment.CommentInput;-import io.onedev.server.web.component.user.ident.Mode;-import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.page.simple.security.LoginPage;-import io.onedev.server.web.util.DeleteCallback;+import javax.servlet.http.Cookie;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Date;+import java.util.List;@SuppressWarnings("serial")public abstract class IssueActivitiesPanel extends Panel {@@ -246,6 +239,7 @@ public abstract class IssueActivitiesPanel extends Panel {}};+ input.setOutputMarkupId(true);input.setRequired(true).setLabel(Model.of("Comment"));Form<?> form = new Form<Void>("form");diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.javaindex dcf4caea2d..0e848764db 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java@@ -24,7 +24,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.markdown.ContentVersionSupport;-import io.onedev.server.web.component.project.comment.CommentPanel;+import io.onedev.server.web.component.comment.CommentPanel;import io.onedev.server.web.util.DeleteCallback;@SuppressWarnings("serial")@@ -91,7 +91,7 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {}@Override- protected boolean canModifyOrDeleteComment() {+ protected boolean canManageComment() {return SecurityUtils.canModifyOrDelete(IssueCommentedPanel.this.getComment());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.javaindex a2603e9f04..00303c9157 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java@@ -13,7 +13,6 @@ import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;-import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;@@ -22,7 +21,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.markdown.ContentVersionSupport;-import io.onedev.server.web.component.project.comment.CommentPanel;+import io.onedev.server.web.component.comment.CommentPanel;import io.onedev.server.web.util.DeleteCallback;@SuppressWarnings("serial")@@ -73,7 +72,7 @@ class IssueOpenedPanel extends GenericPanel<Issue> {}@Override- protected boolean canModifyOrDeleteComment() {+ protected boolean canManageComment() {return SecurityUtils.canModify(getIssue());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 9cf6f8ec94..ae9eacfd63 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -28,7 +28,7 @@ import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.link.IssueLinkPanel;import io.onedev.server.web.component.milestone.choice.MilestoneMultiChoice;import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;-import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex 3ad9e4e667..a1f31d6ad4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -47,7 +47,7 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.ajaxlistener.DisableGlobalAjaxIndicatorListener;import io.onedev.server.web.behavior.RunTaskBehavior;-import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.javaindex 28afccc7a2..f6113848b1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/transitionoption/TransitionOptionPanel.java@@ -34,7 +34,7 @@ import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTriggerimport io.onedev.server.security.SecurityUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/ContentQuoted.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/ContentQuoted.javanew file mode 100644index 0000000000..81e4588a9e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/ContentQuoted.java@@ -0,0 +1,18 @@+package io.onedev.server.web.component.markdown;++import io.onedev.server.web.util.AjaxPayload;+import org.apache.wicket.ajax.AjaxRequestTarget;++public class ContentQuoted extends AjaxPayload {++ private final String content;++ public ContentQuoted(AjaxRequestTarget target, String content) {+ super(target);+ this.content = content;+ }++ public String getContent() {+ return content;+ }+}\ No newline at end of filediff --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 1f7b080a46..6d066691ee 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@@ -26,6 +26,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;@@ -542,7 +543,20 @@ public class MarkdownEditor extends FormComponentPanel<String> {});}-++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof ContentQuoted) {+ ContentQuoted contentQuoted = (ContentQuoted) event.getPayload();++ String script = String.format("onedev.server.markdown.onQuote('%s', '%s');",+ container.getMarkupId(), JavaScriptEscape.escapeJavaScript(contentQuoted.getContent()));+ contentQuoted.getHandler().appendJavaScript(script);+ event.stop();+ }+ }+@Overridepublic void convertInput() {setConvertedInput(input.getConvertedInput());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 f8ae596e21..b9a5e99f7a 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@@ -754,12 +754,13 @@ onedev.server.markdown = {$input.focus();var selected = $input.range();if (selected.length != 0) {- document.execCommand("insertText", false, "> " + selected.text);- $input.range(selected.start+2, selected.end+2);+ document.execCommand("insertText", false,+ onedev.server.markdown.getQuoted(selected.text));} else {document.execCommand("insertText", false, "> quote here");$input.range(selected.start+2, selected.start+2+"quote here".length);}+closeMenu();onedev.server.markdown.fireInputEvent($input);});@@ -1226,6 +1227,20 @@ onedev.server.markdown = {$url.on("input", function() {$text.attr("placeholder", onedev.server.util.describeUrl($url.val()));});+ },+ getQuoted: function(content) {+ var quoted = [];+ content.split('\n').forEach(function(line) {+ quoted.push("> " + line);+ });+ return quoted.join('\n');+ },+ onQuote: function(containerId, content) {+ var quoted = onedev.server.markdown.getQuoted(content);+ var $input = $("#" + containerId + ">.body>.edit>textarea");+ $input.focus();+ document.execCommand("insertText", false, quoted + "\n\n");+ onedev.server.markdown.fireInputEvent($input);}};\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex 90e6b1e287..75d74cf587 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -783,3 +783,13 @@ span.keycap {.row-gap-5 {row-gap: 2rem;}++.d-empty-none:empty {+ display: none !important;+}+.d-last-child-none:last-child {+ display: none !important;+}+.d-first-child-none:first-child {+ display: none !important;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.javaindex 4409b78902..249a5d1b45 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java@@ -107,7 +107,7 @@ import io.onedev.server.web.component.markdown.SuggestionSupport;import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.sourceformat.OptionChangeCallback;import io.onedev.server.web.component.sourceformat.SourceFormatPanel;import io.onedev.server.web.component.suggestionapply.SuggestionApplyBean;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 3b1c26df35..f90ae2903f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -97,7 +97,7 @@ import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.pullrequest.assignment.AssignmentListPanel;import io.onedev.server.web.component.pullrequest.review.ReviewListPanel;import io.onedev.server.web.component.svg.SpriteImage;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.javaindex 8df525efa1..828a5af6b0 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@@ -1,518 +1,518 @@-package io.onedev.server.web.page.project.pullrequests.detail.activities;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Date;-import java.util.HashSet;-import java.util.List;-import java.util.stream.Collectors;--import javax.servlet.http.Cookie;--import org.apache.wicket.AttributeModifier;-import org.apache.wicket.Component;-import org.apache.wicket.RestartResponseAtInterceptPageException;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.behavior.Behavior;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.http.WebRequest;-import org.apache.wicket.request.http.WebResponse;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.ObjectId;-import org.joda.time.DateTime;--import com.google.common.collect.Lists;-import com.google.common.collect.Sets;--import io.onedev.server.OneDev;-import io.onedev.server.attachment.AttachmentSupport;-import io.onedev.server.attachment.ProjectAttachmentSupport;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.PullRequestCommentManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.entityreference.ReferencedFromAware;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestChange;-import io.onedev.server.model.PullRequestComment;-import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.model.User;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.facade.UserCache;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.behavior.WebSocketObserver;-import io.onedev.server.web.component.project.comment.CommentInput;-import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.component.user.ident.Mode;-import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestChangeActivity;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestCommentedActivity;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestOpenedActivity;-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestUpdatedActivity;-import io.onedev.server.web.page.simple.security.LoginPage;-import io.onedev.server.web.util.DeleteCallback;--@SuppressWarnings("serial")-public class PullRequestActivitiesPage extends PullRequestDetailPage {-- private static final String COOKIE_SHOW_COMMENTS = "onedev.server.pullRequest.showComments";-- private static final String COOKIE_SHOW_COMMITS = "onedev.server.pullRequest.showCommits";-- private static final String COOKIE_SHOW_CHANGE_HISTORY = "onedev.server.pullRequest.showChangeHistory";-- private boolean showComments = true;-- private boolean showCommits = true;-- private boolean showChangeHistory = true;-- private WebMarkupContainer container;-- private RepeatingView activitiesView;-- public PullRequestActivitiesPage(PageParameters params) {- super(params);-- WebRequest request = (WebRequest) RequestCycle.get().getRequest();- Cookie cookie = request.getCookie(COOKIE_SHOW_COMMENTS);- if (cookie != null)- showComments = Boolean.valueOf(cookie.getValue());-- cookie = request.getCookie(COOKIE_SHOW_COMMITS);- if (cookie != null)- showCommits = Boolean.valueOf(cookie.getValue());-- cookie = request.getCookie(COOKIE_SHOW_CHANGE_HISTORY);- if (cookie != null)- showChangeHistory = Boolean.valueOf(cookie.getValue());- }-- private Component newActivityRow(String id, PullRequestActivity activity) {- WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity));- row.setOutputMarkupId(true);-- String anchor = activity.getAnchor();- if (anchor != null)- row.setMarkupId(anchor);-- if (activity.getUser() != null)- row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));- else- row.add(new WebMarkupContainer("avatar"));-- Component content = activity.render("content", new DeleteCallback() {-- @Override- public void onDelete(AjaxRequestTarget target) {- row.remove();- target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));- }-- });-- row.add(content);-- row.add(AttributeAppender.append("class", activity.getClass().getSimpleName()));-- return row;- }-- private List<PullRequestActivity> getActivities() {- PullRequest request = getPullRequest();- List<PullRequestActivity> activities = new ArrayList<>();-- activities.add(new PullRequestOpenedActivity(request));-- List<PullRequestActivity> otherActivities = new ArrayList<>();- if (showCommits) {- for (PullRequestUpdate update: request.getUpdates())- otherActivities.add(new PullRequestUpdatedActivity(update));- }-- if (showChangeHistory) {- for (PullRequestChange change: getPullRequest().getChanges()) {- if (change.getData() instanceof ReferencedFromAware) {- ReferencedFromAware<?> referencedFromAware = (ReferencedFromAware<?>) change.getData();- if (referencedFromAware.getReferencedFrom() instanceof Issue) {- Issue issue = (Issue) referencedFromAware.getReferencedFrom();- if (SecurityUtils.canAccess(issue))- otherActivities.add(new PullRequestChangeActivity(change));- } else if (referencedFromAware.getReferencedFrom() != null) {- otherActivities.add(new PullRequestChangeActivity(change));- }- } else {- otherActivities.add(new PullRequestChangeActivity(change));- }- }- }-- if (showComments) {- for (PullRequestComment comment: request.getComments()) {- otherActivities.add(new PullRequestCommentedActivity(comment));- }- }-- otherActivities.sort((o1, o2) -> {- if (o1.getDate().getTime()<o2.getDate().getTime())- return -1;- else if (o1.getDate().getTime()>o2.getDate().getTime())- return 1;- else if (o1 instanceof PullRequestOpenedActivity)- return -1;- else- return 1;- });-- activities.addAll(otherActivities);-- return activities;- }-- private Component newSinceChangesRow(String id, Date sinceDate) {- WebMarkupContainer row = new WebMarkupContainer(id);- row.setOutputMarkupId(true);-- String avatarHtml = String.format("<svg class='icon'><use xlink:href='%s'/></svg>", SpriteImage.getVersionedHref("diff"));- row.add(new Label("avatar", avatarHtml) {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("div");- }-- }.setEscapeModelStrings(false));-- WebMarkupContainer contentColumn = new Fragment("content", "sinceChangesRowContentFrag", this);- contentColumn.add(new SinceChangesLink("sinceChanges", requestModel, sinceDate));- row.add(contentColumn);-- row.add(AttributeAppender.append("class", "since-changes"));-- return row;- }-- private BuildManager getBuildManager() {- return OneDev.getInstance(BuildManager.class);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(container = new WebMarkupContainer("activities") {-- @Override- protected void onBeforeRender() {- addOrReplace(activitiesView = new RepeatingView("activities"));-- List<PullRequestActivity> activities = getActivities();-- Collection<ObjectId> commitIds = new HashSet<>();- for (PullRequestActivity activity: activities) {- if (activity instanceof PullRequestUpdatedActivity) {- PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;- commitIds.addAll(updatedActivity.getUpdate().getCommits()- .stream().map(it->it.copy()).collect(Collectors.toSet()));- }- }-- PullRequest request = getPullRequest();- Project project = request.getTargetProject();- project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));-- List<PullRequestActivity> oldActivities = new ArrayList<>();- List<PullRequestActivity> newActivities = new ArrayList<>();-- for (PullRequestActivity activity: activities) {- if (request.isVisitedAfter(activity.getDate()))- oldActivities.add(activity);- else- newActivities.add(activity);- }-- for (PullRequestActivity activity: oldActivities) {- activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));- }-- if (!oldActivities.isEmpty() && !newActivities.isEmpty()) {- Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();- if (newActivities.stream().anyMatch(it -> it instanceof PullRequestUpdatedActivity))- activitiesView.add(newSinceChangesRow(activitiesView.newChildId(), sinceDate));- }-- for (PullRequestActivity activity: newActivities) {- Component row = newActivityRow(activitiesView.newChildId(), activity);- row.add(AttributeAppender.append("class", "new"));- activitiesView.add(row);- }-- super.onBeforeRender();- }-- });- container.setOutputMarkupId(true);-- if (getLoginUser() != null) {- Fragment fragment = new Fragment("addComment", "addCommentFrag", this);- fragment.setOutputMarkupId(true);-- Form<?> form = new Form<Void>("form");- fragment.add(form);-- CommentInput input = new CommentInput("input", Model.of(""), false) {-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(getProject(), getPullRequest().getUUID(),- SecurityUtils.canManagePullRequests(getProject()));- }-- @Override- protected Project getProject() {- return PullRequestActivitiesPage.this.getProject();- }-- @Override- protected List<User> getMentionables() {- UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();- List<User> users = new ArrayList<>(cache.getUsers());- users.sort(cache.comparingDisplayName(getPullRequest().getParticipants()));- return users;- }-- @Override- protected List<Behavior> getInputBehaviors() {- return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));- }-- };- input.setRequired(true).setLabel(Model.of("Comment"));- form.add(input);-- form.add(new FencedFeedbackPanel("feedback", form));-- form.add(new AjaxSubmitLink("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- String content = input.getModelObject();- if (content.length() > PullRequestComment.MAX_CONTENT_LEN) {- form.error("Comment too long");- target.add(form);- } else {- PullRequestComment comment = new PullRequestComment();- comment.setRequest(getPullRequest());- comment.setUser(getLoginUser());- comment.setContent(input.getModelObject());- OneDev.getInstance(PullRequestCommentManager.class).save(comment);- input.clearMarkdown();-- target.add(fragment);- }- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- });- container.add(fragment);- } else {- Fragment fragment = new Fragment("addComment", "loginToCommentFrag", this);- fragment.add(new Link<Void>("login") {-- @Override- public void onClick() {- throw new RestartResponseAtInterceptPageException(LoginPage.class);- }-- });- container.add(fragment);- }-- add(new WebSocketObserver() {-- @Override- public Collection<String> getObservables() {- return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));- }-- @Override- public void onObservableChanged(IPartialPageRequestHandler handler) {- @SuppressWarnings("deprecation")- Component prevActivityRow = activitiesView.get(activitiesView.size()-1);- PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();- List<PullRequestActivity> newActivities = new ArrayList<>();- for (PullRequestActivity activity: getActivities()) {- if (activity.getDate().after(lastActivity.getDate()))- newActivities.add(activity);- }-- Component sinceChangesRow = null;- for (Component row: activitiesView) {- if (row.getDefaultModelObject() == null) {- sinceChangesRow = row;- break;- }- }-- if (sinceChangesRow == null && !newActivities.isEmpty()- && newActivities.stream().anyMatch(it -> it instanceof PullRequestUpdatedActivity)) {- Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();- sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);- activitiesView.add(sinceChangesRow);- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());- handler.prependJavaScript(script);- handler.add(sinceChangesRow);- prevActivityRow = sinceChangesRow;- }-- Collection<ObjectId> commitIds = new HashSet<>();-- for (PullRequestActivity activity: newActivities) {- Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);- newActivityRow.add(AttributeAppender.append("class", "new"));- activitiesView.add(newActivityRow);-- String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",- newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());- handler.prependJavaScript(script);- handler.add(newActivityRow);-- if (activity instanceof PullRequestUpdatedActivity) {- handler.appendJavaScript("$('tr.since-changes').addClass('visible');");- PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;- commitIds.addAll(updatedActivity.getUpdate().getCommits()- .stream().map(it->it.copy()).collect(Collectors.toSet()));- }- prevActivityRow = newActivityRow;- }-- PullRequest request = getPullRequest();- Project project = request.getTargetProject();- project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));- }-- });- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new PullRequestActivitiesCssResourceReference()));- }-- public Component renderOptions(String componentId) {- Fragment fragment = new Fragment(componentId, "optionsFrag", this);- fragment.add(new AjaxLink<Void>("showComments") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (showComments)- add(AttributeAppender.append("class", "active"));- setOutputMarkupId(true);- }-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- @Override- public void onClick(AjaxRequestTarget target) {- showComments = !showComments;- WebResponse response = (WebResponse) RequestCycle.get().getResponse();- Cookie cookie = new Cookie(COOKIE_SHOW_COMMENTS, String.valueOf(showComments));- cookie.setPath("/");- cookie.setMaxAge(Integer.MAX_VALUE);- response.addCookie(cookie);- target.add(container);- target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));- }-- });-- fragment.add(new AjaxLink<Void>("showCommits") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (showCommits)- add(AttributeAppender.append("class", "active"));- setOutputMarkupId(true);- }-- @Override- public void onClick(AjaxRequestTarget target) {- showCommits = !showCommits;- WebResponse response = (WebResponse) RequestCycle.get().getResponse();- Cookie cookie = new Cookie(COOKIE_SHOW_COMMITS, String.valueOf(showCommits));- cookie.setPath("/");- cookie.setMaxAge(Integer.MAX_VALUE);- response.addCookie(cookie);- target.add(container);- target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));- }-- });-- fragment.add(new AjaxLink<Void>("showChangeHistory") {-- @Override- protected void onInitialize() {- super.onInitialize();- if (showChangeHistory)- add(AttributeAppender.append("class", "active"));- setOutputMarkupId(true);- }-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- @Override- public void onClick(AjaxRequestTarget target) {- showChangeHistory = !showChangeHistory;- WebResponse response = (WebResponse) RequestCycle.get().getResponse();- Cookie cookie = new Cookie(COOKIE_SHOW_CHANGE_HISTORY, String.valueOf(showChangeHistory));- cookie.setPath("/");- cookie.setMaxAge(Integer.MAX_VALUE);- response.addCookie(cookie);- target.add(container);- target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));- }-- });-- return fragment;- }-}+package io.onedev.server.web.page.project.pullrequests.detail.activities;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Date;+import java.util.HashSet;+import java.util.List;+import java.util.stream.Collectors;++import javax.servlet.http.Cookie;++import org.apache.wicket.AttributeModifier;+import org.apache.wicket.Component;+import org.apache.wicket.RestartResponseAtInterceptPageException;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.http.WebRequest;+import org.apache.wicket.request.http.WebResponse;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;+import org.joda.time.DateTime;++import com.google.common.collect.Lists;+import com.google.common.collect.Sets;++import io.onedev.server.OneDev;+import io.onedev.server.attachment.AttachmentSupport;+import io.onedev.server.attachment.ProjectAttachmentSupport;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.PullRequestCommentManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.entityreference.ReferencedFromAware;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestChange;+import io.onedev.server.model.PullRequestComment;+import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.facade.UserCache;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.behavior.WebSocketObserver;+import io.onedev.server.web.component.comment.CommentInput;+import io.onedev.server.web.component.svg.SpriteImage;+import io.onedev.server.web.component.user.ident.Mode;+import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestChangeActivity;+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestCommentedActivity;+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestOpenedActivity;+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestUpdatedActivity;+import io.onedev.server.web.page.simple.security.LoginPage;+import io.onedev.server.web.util.DeleteCallback;++@SuppressWarnings("serial")+public class PullRequestActivitiesPage extends PullRequestDetailPage {++ private static final String COOKIE_SHOW_COMMENTS = "onedev.server.pullRequest.showComments";++ private static final String COOKIE_SHOW_COMMITS = "onedev.server.pullRequest.showCommits";++ private static final String COOKIE_SHOW_CHANGE_HISTORY = "onedev.server.pullRequest.showChangeHistory";++ private boolean showComments = true;++ private boolean showCommits = true;++ private boolean showChangeHistory = true;++ private WebMarkupContainer container;++ private RepeatingView activitiesView;++ public PullRequestActivitiesPage(PageParameters params) {+ super(params);++ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie cookie = request.getCookie(COOKIE_SHOW_COMMENTS);+ if (cookie != null)+ showComments = Boolean.valueOf(cookie.getValue());++ cookie = request.getCookie(COOKIE_SHOW_COMMITS);+ if (cookie != null)+ showCommits = Boolean.valueOf(cookie.getValue());++ cookie = request.getCookie(COOKIE_SHOW_CHANGE_HISTORY);+ if (cookie != null)+ showChangeHistory = Boolean.valueOf(cookie.getValue());+ }++ private Component newActivityRow(String id, PullRequestActivity activity) {+ WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity));+ row.setOutputMarkupId(true);++ String anchor = activity.getAnchor();+ if (anchor != null)+ row.setMarkupId(anchor);++ if (activity.getUser() != null)+ row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));+ else+ row.add(new WebMarkupContainer("avatar"));++ Component content = activity.render("content", new DeleteCallback() {++ @Override+ public void onDelete(AjaxRequestTarget target) {+ row.remove();+ target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));+ }++ });++ row.add(content);++ row.add(AttributeAppender.append("class", activity.getClass().getSimpleName()));++ return row;+ }++ private List<PullRequestActivity> getActivities() {+ PullRequest request = getPullRequest();+ List<PullRequestActivity> activities = new ArrayList<>();++ activities.add(new PullRequestOpenedActivity(request));++ List<PullRequestActivity> otherActivities = new ArrayList<>();+ if (showCommits) {+ for (PullRequestUpdate update: request.getUpdates())+ otherActivities.add(new PullRequestUpdatedActivity(update));+ }++ if (showChangeHistory) {+ for (PullRequestChange change: getPullRequest().getChanges()) {+ if (change.getData() instanceof ReferencedFromAware) {+ ReferencedFromAware<?> referencedFromAware = (ReferencedFromAware<?>) change.getData();+ if (referencedFromAware.getReferencedFrom() instanceof Issue) {+ Issue issue = (Issue) referencedFromAware.getReferencedFrom();+ if (SecurityUtils.canAccess(issue))+ otherActivities.add(new PullRequestChangeActivity(change));+ } else if (referencedFromAware.getReferencedFrom() != null) {+ otherActivities.add(new PullRequestChangeActivity(change));+ }+ } else {+ otherActivities.add(new PullRequestChangeActivity(change));+ }+ }+ }++ if (showComments) {+ for (PullRequestComment comment: request.getComments()) {+ otherActivities.add(new PullRequestCommentedActivity(comment));+ }+ }++ otherActivities.sort((o1, o2) -> {+ if (o1.getDate().getTime()<o2.getDate().getTime())+ return -1;+ else if (o1.getDate().getTime()>o2.getDate().getTime())+ return 1;+ else if (o1 instanceof PullRequestOpenedActivity)+ return -1;+ else+ return 1;+ });++ activities.addAll(otherActivities);++ return activities;+ }++ private Component newSinceChangesRow(String id, Date sinceDate) {+ WebMarkupContainer row = new WebMarkupContainer(id);+ row.setOutputMarkupId(true);++ String avatarHtml = String.format("<svg class='icon'><use xlink:href='%s'/></svg>", SpriteImage.getVersionedHref("diff"));+ row.add(new Label("avatar", avatarHtml) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("div");+ }++ }.setEscapeModelStrings(false));++ WebMarkupContainer contentColumn = new Fragment("content", "sinceChangesRowContentFrag", this);+ contentColumn.add(new SinceChangesLink("sinceChanges", requestModel, sinceDate));+ row.add(contentColumn);++ row.add(AttributeAppender.append("class", "since-changes"));++ return row;+ }++ private BuildManager getBuildManager() {+ return OneDev.getInstance(BuildManager.class);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(container = new WebMarkupContainer("activities") {++ @Override+ protected void onBeforeRender() {+ addOrReplace(activitiesView = new RepeatingView("activities"));++ List<PullRequestActivity> activities = getActivities();++ Collection<ObjectId> commitIds = new HashSet<>();+ for (PullRequestActivity activity: activities) {+ if (activity instanceof PullRequestUpdatedActivity) {+ PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;+ commitIds.addAll(updatedActivity.getUpdate().getCommits()+ .stream().map(it->it.copy()).collect(Collectors.toSet()));+ }+ }++ PullRequest request = getPullRequest();+ Project project = request.getTargetProject();+ project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));++ List<PullRequestActivity> oldActivities = new ArrayList<>();+ List<PullRequestActivity> newActivities = new ArrayList<>();++ for (PullRequestActivity activity: activities) {+ if (request.isVisitedAfter(activity.getDate()))+ oldActivities.add(activity);+ else+ newActivities.add(activity);+ }++ for (PullRequestActivity activity: oldActivities) {+ activitiesView.add(newActivityRow(activitiesView.newChildId(), activity));+ }++ if (!oldActivities.isEmpty() && !newActivities.isEmpty()) {+ Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();+ if (newActivities.stream().anyMatch(it -> it instanceof PullRequestUpdatedActivity))+ activitiesView.add(newSinceChangesRow(activitiesView.newChildId(), sinceDate));+ }++ for (PullRequestActivity activity: newActivities) {+ Component row = newActivityRow(activitiesView.newChildId(), activity);+ row.add(AttributeAppender.append("class", "new"));+ activitiesView.add(row);+ }++ super.onBeforeRender();+ }++ });+ container.setOutputMarkupId(true);++ if (getLoginUser() != null) {+ Fragment fragment = new Fragment("addComment", "addCommentFrag", this);+ fragment.setOutputMarkupId(true);++ Form<?> form = new Form<Void>("form");+ fragment.add(form);++ CommentInput input = new CommentInput("input", Model.of(""), false) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), getPullRequest().getUUID(),+ SecurityUtils.canManagePullRequests(getProject()));+ }++ @Override+ protected Project getProject() {+ return PullRequestActivitiesPage.this.getProject();+ }++ @Override+ protected List<User> getMentionables() {+ UserCache cache = OneDev.getInstance(UserManager.class).cloneCache();+ List<User> users = new ArrayList<>(cache.getUsers());+ users.sort(cache.comparingDisplayName(getPullRequest().getParticipants()));+ return users;+ }++ @Override+ protected List<Behavior> getInputBehaviors() {+ return Lists.newArrayList(AttributeModifier.replace("placeholder", "Leave a comment"));+ }++ };+ input.setRequired(true).setLabel(Model.of("Comment"));+ form.add(input);++ form.add(new FencedFeedbackPanel("feedback", form));++ form.add(new AjaxSubmitLink("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ String content = input.getModelObject();+ if (content.length() > PullRequestComment.MAX_CONTENT_LEN) {+ form.error("Comment too long");+ target.add(form);+ } else {+ PullRequestComment comment = new PullRequestComment();+ comment.setRequest(getPullRequest());+ comment.setUser(getLoginUser());+ comment.setContent(input.getModelObject());+ OneDev.getInstance(PullRequestCommentManager.class).save(comment);+ input.clearMarkdown();++ target.add(fragment);+ }+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ container.add(fragment);+ } else {+ Fragment fragment = new Fragment("addComment", "loginToCommentFrag", this);+ fragment.add(new Link<Void>("login") {++ @Override+ public void onClick() {+ throw new RestartResponseAtInterceptPageException(LoginPage.class);+ }++ });+ container.add(fragment);+ }++ add(new WebSocketObserver() {++ @Override+ public Collection<String> getObservables() {+ return Sets.newHashSet(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ }++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ @SuppressWarnings("deprecation")+ Component prevActivityRow = activitiesView.get(activitiesView.size()-1);+ PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();+ List<PullRequestActivity> newActivities = new ArrayList<>();+ for (PullRequestActivity activity: getActivities()) {+ if (activity.getDate().after(lastActivity.getDate()))+ newActivities.add(activity);+ }++ Component sinceChangesRow = null;+ for (Component row: activitiesView) {+ if (row.getDefaultModelObject() == null) {+ sinceChangesRow = row;+ break;+ }+ }++ if (sinceChangesRow == null && !newActivities.isEmpty()+ && newActivities.stream().anyMatch(it -> it instanceof PullRequestUpdatedActivity)) {+ Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();+ sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);+ activitiesView.add(sinceChangesRow);+ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ sinceChangesRow.getMarkupId(), prevActivityRow.getMarkupId());+ handler.prependJavaScript(script);+ handler.add(sinceChangesRow);+ prevActivityRow = sinceChangesRow;+ }++ Collection<ObjectId> commitIds = new HashSet<>();++ for (PullRequestActivity activity: newActivities) {+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), activity);+ newActivityRow.add(AttributeAppender.append("class", "new"));+ activitiesView.add(newActivityRow);++ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ newActivityRow.getMarkupId(), prevActivityRow.getMarkupId());+ handler.prependJavaScript(script);+ handler.add(newActivityRow);++ if (activity instanceof PullRequestUpdatedActivity) {+ handler.appendJavaScript("$('tr.since-changes').addClass('visible');");+ PullRequestUpdatedActivity updatedActivity = (PullRequestUpdatedActivity) activity;+ commitIds.addAll(updatedActivity.getUpdate().getCommits()+ .stream().map(it->it.copy()).collect(Collectors.toSet()));+ }+ prevActivityRow = newActivityRow;+ }++ PullRequest request = getPullRequest();+ Project project = request.getTargetProject();+ project.cacheCommitStatus(getBuildManager().queryStatus(project, commitIds));+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new PullRequestActivitiesCssResourceReference()));+ }++ public Component renderOptions(String componentId) {+ Fragment fragment = new Fragment(componentId, "optionsFrag", this);+ fragment.add(new AjaxLink<Void>("showComments") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (showComments)+ add(AttributeAppender.append("class", "active"));+ setOutputMarkupId(true);+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ showComments = !showComments;+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();+ Cookie cookie = new Cookie(COOKIE_SHOW_COMMENTS, String.valueOf(showComments));+ cookie.setPath("/");+ cookie.setMaxAge(Integer.MAX_VALUE);+ response.addCookie(cookie);+ target.add(container);+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));+ }++ });++ fragment.add(new AjaxLink<Void>("showCommits") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (showCommits)+ add(AttributeAppender.append("class", "active"));+ setOutputMarkupId(true);+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ showCommits = !showCommits;+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();+ Cookie cookie = new Cookie(COOKIE_SHOW_COMMITS, String.valueOf(showCommits));+ cookie.setPath("/");+ cookie.setMaxAge(Integer.MAX_VALUE);+ response.addCookie(cookie);+ target.add(container);+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));+ }++ });++ fragment.add(new AjaxLink<Void>("showChangeHistory") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (showChangeHistory)+ add(AttributeAppender.append("class", "active"));+ setOutputMarkupId(true);+ }++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ showChangeHistory = !showChangeHistory;+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();+ Cookie cookie = new Cookie(COOKIE_SHOW_CHANGE_HISTORY, String.valueOf(showChangeHistory));+ cookie.setPath("/");+ cookie.setMaxAge(Integer.MAX_VALUE);+ response.addCookie(cookie);+ target.add(container);+ target.appendJavaScript(String.format("$('#%s').toggleClass('active');", getMarkupId()));+ }++ });++ return fragment;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.javaindex 1c5ae7baa7..e682b1e73a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java@@ -26,7 +26,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.markdown.ContentVersionSupport;-import io.onedev.server.web.component.project.comment.CommentPanel;+import io.onedev.server.web.component.comment.CommentPanel;import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;import io.onedev.server.web.util.DeleteCallback;@@ -103,7 +103,7 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {}@Override- protected boolean canModifyOrDeleteComment() {+ protected boolean canManageComment() {return SecurityUtils.canModifyOrDelete(PullRequestCommentedPanel.this.getComment());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.javaindex 0eb8baf26a..06398d4f14 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java@@ -21,7 +21,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.markdown.ContentVersionSupport;-import io.onedev.server.web.component.project.comment.CommentPanel;+import io.onedev.server.web.component.comment.CommentPanel;import io.onedev.server.web.util.DeleteCallback;@SuppressWarnings("serial")@@ -72,7 +72,7 @@ class PullRequestOpenedPanel extends GenericPanel<PullRequest> {}@Override- protected boolean canModifyOrDeleteComment() {+ protected boolean canManageComment() {return SecurityUtils.canModify(getPullRequest());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.javaindex 3aadc38ee7..b20f185d75 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationconfirm/CommentableOperationConfirmPanel.java@@ -20,7 +20,7 @@ import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.comment.CommentInput;@SuppressWarnings("serial")public abstract class CommentableOperationConfirmPanel extends OperationConfirmPanel {