Skip to content

The Unified and Autonomous Development Platform

chore: Refactor build description edit to avoid confusion

Robin Shenbd595f477baa
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
index 60709737ab..4ad3018511 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
@@ -208,7 +208,7 @@ public abstract class CommentPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getAuthUser() != null && getComment() != null);
+ setVisible(isQuoteEnabled() && SecurityUtils.getAuthUser() != null && getComment() != null);
}
});
@@ -234,19 +234,23 @@ public abstract class CommentPanel extends Panel {
});
- viewer.add(new ReactionListPanel("reactions") {
-
+ if (getReactionSupport() != null) {
+ viewer.add(new ReactionListPanel("reactions") {
+
@Override
- protected Collection<? extends EntityReaction> getReactions() {
- return CommentPanel.this.getReactions();
- }
+ protected Collection<? extends EntityReaction> getReactions() {
+ return getReactionSupport().getReactions();
+ }
- @Override
- protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
- CommentPanel.this.onToggleEmoji(target, emoji);
- }
-
- });
+ @Override
+ protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ getReactionSupport().onToggleEmoji(target, emoji);
+ }
+
+ });
+ } else {
+ viewer.add(new WebMarkupContainer("reactions"));
+ }
viewer.add(newMoreActions("moreActions"));
@@ -297,8 +301,11 @@ public abstract class CommentPanel extends Panel {
return new WebMarkupContainer("moreActions").setVisible(false);
}
- protected abstract Collection<? extends EntityReaction> getReactions();
-
- protected abstract void onToggleEmoji(AjaxRequestTarget target, String emoji);
+ @Nullable
+ protected abstract ReactionSupport getReactionSupport();
+ protected boolean isQuoteEnabled() {
+ return true;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/ReactionSupport.java b/server-core/src/main/java/io/onedev/server/web/component/comment/ReactionSupport.java
new file mode 100644
index 0000000000..68f9ea7fa4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/ReactionSupport.java
@@ -0,0 +1,15 @@
+package io.onedev.server.web.component.comment;
+
+import java.util.Collection;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+import io.onedev.server.model.support.EntityReaction;
+
+public interface ReactionSupport {
+
+ Collection<? extends EntityReaction> getReactions();
+
+ void onToggleEmoji(AjaxRequestTarget target, String emoji);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java
index 600be84fe4..d2cd6c4f74 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentPanel.java
@@ -24,6 +24,7 @@ import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.comment.CommentPanel;
+import io.onedev.server.web.component.comment.ReactionSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
@@ -62,6 +63,11 @@ class IssueCommentPanel extends Panel {
return IssueCommentPanel.this.getComment().getContent();
}
+ @Override
+ protected boolean isQuoteEnabled() {
+ return true;
+ }
+
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
if (comment.length() > IssueComment.MAX_CONTENT_LEN)
@@ -124,18 +130,25 @@ class IssueCommentPanel extends Panel {
}
@Override
- protected Collection<? extends EntityReaction> getReactions() {
- return IssueCommentPanel.this.getComment().getReactions();
- }
+ protected ReactionSupport getReactionSupport() {
+ return new ReactionSupport() {
- @Override
- protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
- OneDev.getInstance(IssueCommentReactionManager.class).toggleEmoji(
- SecurityUtils.getUser(),
- IssueCommentPanel.this.getComment(),
- emoji);
+ @Override
+ public Collection<? extends EntityReaction> getReactions() {
+ return IssueCommentPanel.this.getComment().getReactions();
+ }
+
+ @Override
+ public void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ OneDev.getInstance(IssueCommentReactionManager.class).toggleEmoji(
+ SecurityUtils.getUser(),
+ IssueCommentPanel.this.getComment(),
+ emoji);
+ }
+
+ };
}
-
+
});
setMarkupId(getComment().getAnchor());
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
index ac3defbf85..0d17c8a572 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
@@ -1,14 +1,13 @@
package io.onedev.server.web.component.issue.primary;
import static io.onedev.server.security.SecurityUtils.canAccessIssue;
-import static io.onedev.server.security.SecurityUtils.canEditIssueLink;
-import static java.util.stream.Collectors.toList;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.stream.Collectors;
import javax.annotation.Nullable;
@@ -62,6 +61,7 @@ import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.comment.CommentPanel;
+import io.onedev.server.web.component.comment.ReactionSupport;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.issue.IssueStateBadge;
import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;
@@ -95,7 +95,7 @@ public abstract class IssuePrimaryPanel extends Panel {
protected List<LinkDescriptor> load() {
var linkDescriptors = new ArrayList<LinkDescriptor>();
for (LinkSpec spec: linkSpecsModel.getObject()) {
- if (canEditIssueLink(getProject(), spec)) {
+ if (SecurityUtils.canEditIssueLink(getProject(), spec)) {
if (spec.getOpposite() != null) {
if (spec.getOpposite().getParsedIssueQuery(getProject()).matches(getIssue()))
linkDescriptors.add(new LinkDescriptor(spec, false));
@@ -117,14 +117,14 @@ public abstract class IssuePrimaryPanel extends Panel {
List<LinkGroup> linkGroups = new ArrayList<>();
for (LinkSpec spec : linkSpecsModel.getObject()) {
if (spec.getOpposite() != null) {
- var targetIssues = getIssue().findLinkedIssues(spec, false).stream().filter(it->canAccessIssue(it)).collect(toList());
+ var targetIssues = getIssue().findLinkedIssues(spec, false).stream().filter(it->canAccessIssue(it)).collect(Collectors.toList());
if (!targetIssues.isEmpty())
linkGroups.add(new LinkGroup(new LinkDescriptor(spec, false), targetIssues));
- var sourceIssues = getIssue().findLinkedIssues(spec, true).stream().filter(it->canAccessIssue(it)).collect(toList());
+ var sourceIssues = getIssue().findLinkedIssues(spec, true).stream().filter(it->canAccessIssue(it)).collect(Collectors.toList());
if (!sourceIssues.isEmpty())
linkGroups.add(new LinkGroup(new LinkDescriptor(spec, true), sourceIssues));
} else {
- var issues = getIssue().findLinkedIssues(spec, false).stream().filter(it->canAccessIssue(it)).collect(toList());
+ var issues = getIssue().findLinkedIssues(spec, false).stream().filter(it->canAccessIssue(it)).collect(Collectors.toList());
if (!issues.isEmpty())
linkGroups.add(new LinkGroup(new LinkDescriptor(spec, false), issues));
}
@@ -213,16 +213,23 @@ public abstract class IssuePrimaryPanel extends Panel {
}
@Override
- protected Collection<? extends EntityReaction> getReactions() {
- return getIssue().getReactions();
- }
-
- @Override
- protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
- OneDev.getInstance(IssueReactionManager.class).toggleEmoji(
- SecurityUtils.getUser(),
- getIssue(),
- emoji);
+ protected ReactionSupport getReactionSupport() {
+ return new ReactionSupport() {
+
+ @Override
+ public Collection<? extends EntityReaction> getReactions() {
+ return getIssue().getReactions();
+ }
+
+ @Override
+ public void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ OneDev.getInstance(IssueReactionManager.class).toggleEmoji(
+ SecurityUtils.getUser(),
+ getIssue(),
+ emoji);
+ }
+
+ };
}
@Override
@@ -300,7 +307,7 @@ public abstract class IssuePrimaryPanel extends Panel {
var specId = spec.getId();
var opposite = descriptor.isOpposite();
- boolean canEditIssueLink = canEditIssueLink(getProject(), spec);
+ boolean canEditIssueLink = SecurityUtils.canEditIssueLink(getProject(), spec);
String linkName = spec.getName(opposite);
item.add(new Label("name", linkName));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
index a4e84dbe4b..7c8ca72705 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
@@ -10,7 +10,6 @@
<div wicket:id="actions" class="mr-2">
<a wicket:id="rebuild" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2" title="Re-run this build"><wicket:svg href="re-run" class="icon"/></a>
<a wicket:id="cancel" class="btn btn-icon btn-light btn-hover-danger btn-xs mr-2" title="Cancel this build"><wicket:svg href="cancel" class="icon"/></a>
- <a wicket:id="edit" title="Edit build description" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2"><wicket:svg href="edit-file" class="icon"/></a>
<a wicket:id="terminal" title="Open terminal of current running step" class="ee-feature btn btn-icon btn-light btn-hover-primary btn-xs mr-2"><wicket:svg href="terminal" class="icon"/></a>
<a wicket:id="promotions" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-2" title="Promotions"><wicket:svg href="next" class="icon"/></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index 8e446543d2..92096d6217 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -1,14 +1,45 @@
package io.onedev.server.web.page.project.builds.detail;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.persistence.EntityNotFoundException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.Page;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.Session;
+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.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.flow.RedirectToUrlException;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import com.google.common.collect.Sets;
+
import io.onedev.server.OneDev;
+import io.onedev.server.attachment.AttachmentSupport;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobDependency;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.event.ListenerRegistry;
-import io.onedev.server.event.project.build.BuildUpdated;
import io.onedev.server.job.JobAuthorizationContext;
import io.onedev.server.job.JobAuthorizationContextAware;
import io.onedev.server.job.JobContext;
@@ -26,22 +57,22 @@ import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.ChangeObserver;
-import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.build.side.BuildSidePanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
+import io.onedev.server.web.component.comment.CommentPanel;
+import io.onedev.server.web.component.comment.ReactionSupport;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.job.joblist.JobListPanel;
import io.onedev.server.web.component.link.BuildSpecLink;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
+import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.modal.message.MessageModal;
import io.onedev.server.web.component.sideinfo.SideInfoLink;
import io.onedev.server.web.component.sideinfo.SideInfoPanel;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
-import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;
@@ -56,35 +87,7 @@ import io.onedev.server.web.util.BuildAware;
import io.onedev.server.web.util.ConfirmClickModifier;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.Page;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.Session;
-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.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.flow.RedirectToUrlException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import javax.persistence.EntityNotFoundException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
+import io.onedev.server.web.util.DeleteCallback;
public abstract class BuildDetailPage extends ProjectPage
implements InputContext, BuildAware, JobAuthorizationContextAware {
@@ -284,34 +287,6 @@ public abstract class BuildDetailPage extends ProjectPage
}.setOutputMarkupId(true));
- add(new AjaxLink<Void>("edit") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- DescriptionBean bean = new DescriptionBean();
- bean.setValue(getBuild().getDescription());
- new BeanEditModalPanel<Serializable>(target, bean) {
-
- @Override
- protected String onSave(AjaxRequestTarget target, Serializable bean) {
- getBuild().setDescription(((DescriptionBean)bean).getValue());
- OneDev.getInstance(BuildManager.class).update(getBuild());
- OneDev.getInstance(ListenerRegistry.class).post(new BuildUpdated(getBuild()));
- ((BasePage)getPage()).notifyObservablesChange(target, getBuild().getChangeObservables());
- close();
- return null;
- }
-
- };
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.canManageBuild(getBuild()));
- }
-
- });
add(new AjaxLink<Void>("terminal") {
private TerminalManager getTerminalManager() {
@@ -421,23 +396,76 @@ public abstract class BuildDetailPage extends ProjectPage
add(jobNotFoundContainer);
- add(new MarkdownViewer("description", new AbstractReadOnlyModel<>() {
-
+ add(new CommentPanel("description") {
+
@Override
- public String getObject() {
+ protected String getComment() {
return getBuild().getDescription();
}
- }, null) {
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, String comment) {
+ getBuild().setDescription(comment);
+ OneDev.getInstance(BuildManager.class).update(getBuild());
+ }
+
+ @Override
+ protected Project getProject() {
+ return getBuild().getProject();
+ }
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return null;
+ }
+
+ @Override
+ protected boolean canManageComment() {
+ return SecurityUtils.canManageBuild(getBuild());
+ }
+
+ @Override
+ protected String getRequiredLabel() {
+ return null;
+ }
+
+ @Override
+ protected String getEmptyDescription() {
+ return "No description";
+ }
+
+ @Override
+ protected ContentVersionSupport getContentVersionSupport() {
+ return null;
+ }
+
+ @Override
+ protected DeleteCallback getDeleteCallback() {
+ return null;
+ }
+
+ @Override
+ protected String getAutosaveKey() {
+ return "build:" + getBuild().getId() + ":description";
+ }
+
+ @Override
+ protected ReactionSupport getReactionSupport() {
+ return null;
+ }
+
+ @Override
+ protected boolean isQuoteEnabled() {
+ return false;
+ }
+
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getBuild().getDescription() != null);
+ setVisible(getBuild().getDescription() != null || SecurityUtils.canManageBuild(getBuild()));
}
-
- }.setOutputMarkupPlaceholderTag(true).add(newBuildObserver(getBuild().getId())));
-
+ });
+
add(new Tabbable("buildTabs", new LoadableDetachableModel<>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/DescriptionBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/DescriptionBean.java
deleted file mode 100644
index dde4388d06..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/DescriptionBean.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.onedev.server.web.page.project.builds.detail;
-
-import java.io.Serializable;
-
-import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.Markdown;
-import io.onedev.server.annotation.OmitName;
-
-@Editable(name="Build Description")
-public class DescriptionBean implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String value;
-
- @Editable
- @Markdown
- @OmitName
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index c03c2dcac9..fb30565d2a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -112,6 +112,7 @@ import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.comment.CommentPanel;
+import io.onedev.server.web.component.comment.ReactionSupport;
import io.onedev.server.web.component.entity.labels.EntityLabelsPanel;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.entity.reference.EntityReferencePanel;
@@ -1687,16 +1688,22 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
@Override
- protected Collection<? extends EntityReaction> getReactions() {
- return getPullRequest().getReactions();
- }
+ protected ReactionSupport getReactionSupport() {
+ return new ReactionSupport() {
- @Override
- protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
- OneDev.getInstance(PullRequestReactionManager.class).toggleEmoji(
- SecurityUtils.getUser(),
- getPullRequest(),
- emoji);
+ @Override
+ public Collection<? extends EntityReaction> getReactions() {
+ return getPullRequest().getReactions();
+ }
+
+ @Override
+ public void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ OneDev.getInstance(PullRequestReactionManager.class).toggleEmoji(
+ SecurityUtils.getUser(),
+ getPullRequest(),
+ emoji);
+ }
+ };
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java
index d0ea6e1d3e..ff0537ba72 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentPanel.java
@@ -26,6 +26,7 @@ import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.comment.CommentPanel;
+import io.onedev.server.web.component.comment.ReactionSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
@@ -136,16 +137,23 @@ class PullRequestCommentPanel extends Panel {
}
@Override
- protected Collection<? extends EntityReaction> getReactions() {
- return PullRequestCommentPanel.this.getComment().getReactions();
- }
+ protected ReactionSupport getReactionSupport() {
+ return new ReactionSupport() {
- @Override
- protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
- OneDev.getInstance(PullRequestCommentReactionManager.class).toggleEmoji(
- SecurityUtils.getUser(),
- PullRequestCommentPanel.this.getComment(),
- emoji);
+ @Override
+ public Collection<? extends EntityReaction> getReactions() {
+ return PullRequestCommentPanel.this.getComment().getReactions();
+ }
+
+ @Override
+ public void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ OneDev.getInstance(PullRequestCommentReactionManager.class).toggleEmoji(
+ SecurityUtils.getUser(),
+ PullRequestCommentPanel.this.getComment(),
+ emoji);
+ }
+
+ };
}
});