The Unified and Autonomous Development Platform
Vote/unvote issue and fix a websocket error not displaying issue
Robin Shene94fe2723eb9
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 62b99af5e1..e849f7daf9 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -97,6 +97,8 @@ import io.onedev.server.manager.IssueCommentManager;import io.onedev.server.manager.IssueFieldManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueRelationManager;+import io.onedev.server.manager.IssueVoteManager;+import io.onedev.server.manager.IssueWatchManager;import io.onedev.server.manager.MailManager;import io.onedev.server.manager.MarkdownManager;import io.onedev.server.manager.MembershipManager;@@ -136,6 +138,8 @@ import io.onedev.server.manager.impl.DefaultIssueCommentManager;import io.onedev.server.manager.impl.DefaultIssueFieldManager;import io.onedev.server.manager.impl.DefaultIssueManager;import io.onedev.server.manager.impl.DefaultIssueRelationManager;+import io.onedev.server.manager.impl.DefaultIssueVoteManager;+import io.onedev.server.manager.impl.DefaultIssueWatchManager;import io.onedev.server.manager.impl.DefaultMailManager;import io.onedev.server.manager.impl.DefaultMarkdownManager;import io.onedev.server.manager.impl.DefaultMembershipManager;@@ -310,7 +314,9 @@ public class CoreModule extends AbstractPluginModule {bind(PullRequestReferenceManager.class).to(DefaultPullRequestReferenceManager.class);bind(WorkExecutor.class).to(DefaultWorkExecutor.class);bind(NotificationManager.class).to(DefaultNotificationManager.class);+ bind(IssueWatchManager.class).to(DefaultIssueWatchManager.class);bind(IssueChangeManager.class).to(DefaultIssueChangeManager.class);+ bind(IssueVoteManager.class).to(DefaultIssueVoteManager.class);bind(IssueRelationManager.class).to(DefaultIssueRelationManager.class);bind(CacheManager.class).to(DefaultCacheManager.class);bind(VerificationManager.class).to(DefaultVerificationManager.class);diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueChanged.java b/core/src/main/java/io/onedev/server/event/issue/IssueChanged.javaindex cfaad8a569..610af6ebc9 100644--- a/core/src/main/java/io/onedev/server/event/issue/IssueChanged.java+++ b/core/src/main/java/io/onedev/server/event/issue/IssueChanged.java@@ -6,7 +6,7 @@ import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;import io.onedev.server.util.editable.annotation.Editable;-@Editable(name="commented")+@Editable(name="changed")public class IssueChanged extends IssueEvent {private final IssueChange change;diff --git a/core/src/main/java/io/onedev/server/manager/IssueVoteManager.java b/core/src/main/java/io/onedev/server/manager/IssueVoteManager.javanew file mode 100644index 0000000000..f3197150ab--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/IssueVoteManager.java@@ -0,0 +1,8 @@+package io.onedev.server.manager;++import io.onedev.server.model.IssueVote;+import io.onedev.server.persistence.dao.EntityManager;++public interface IssueVoteManager extends EntityManager<IssueVote> {++}diff --git a/core/src/main/java/io/onedev/server/manager/IssueWatchManager.java b/core/src/main/java/io/onedev/server/manager/IssueWatchManager.javanew file mode 100644index 0000000000..cb6b8067d3--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/IssueWatchManager.java@@ -0,0 +1,8 @@+package io.onedev.server.manager;++import io.onedev.server.model.IssueWatch;+import io.onedev.server.persistence.dao.EntityManager;++public interface IssueWatchManager extends EntityManager<IssueWatch> {++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueVoteManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueVoteManager.javanew file mode 100644index 0000000000..e210101421--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueVoteManager.java@@ -0,0 +1,35 @@+package io.onedev.server.manager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.manager.IssueVoteManager;+import io.onedev.server.model.IssueVote;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultIssueVoteManager extends AbstractEntityManager<IssueVote>+ implements IssueVoteManager {++ @Inject+ public DefaultIssueVoteManager(Dao dao) {+ super(dao);+ }++ @Transactional+ public void save(IssueVote vote) {+ if (vote.isNew())+ vote.getIssue().setNumOfVotes(vote.getIssue().getNumOfVotes()+1);+ super.save(vote);+ }++ @Transactional+ @Override+ public void delete(IssueVote vote) {+ super.delete(vote);+ vote.getIssue().setNumOfVotes(vote.getIssue().getNumOfVotes()-1);+ }++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueWatchManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueWatchManager.javanew file mode 100644index 0000000000..f9a8fa5894--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueWatchManager.java@@ -0,0 +1,19 @@+package io.onedev.server.manager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.manager.IssueWatchManager;+import io.onedev.server.model.IssueWatch;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultIssueWatchManager extends AbstractEntityManager<IssueWatch>+ implements IssueWatchManager {++ @Inject+ public DefaultIssueWatchManager(Dao dao) {+ super(dao);+ }+}diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 9448199163..bc39275719 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -145,6 +145,9 @@ public class Issue extends AbstractEntity implements Referenceable {@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueChange> changes = new ArrayList<>();+ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)+ private Collection<IssueVote> votes = new ArrayList<>();+private transient Map<String, PromptedField> promptedFields;public long getVersion() {@@ -243,6 +246,14 @@ public class Issue extends AbstractEntity implements Referenceable {this.changes = changes;}+ public Collection<IssueVote> getVotes() {+ return votes;+ }++ public void setVotes(Collection<IssueVote> votes) {+ this.votes = votes;+ }+public int getNumOfVotes() {return numOfVotes;}diff --git a/core/src/main/java/io/onedev/server/model/IssueVote.java b/core/src/main/java/io/onedev/server/model/IssueVote.javanew file mode 100644index 0000000000..9eedeac807--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/IssueVote.java@@ -0,0 +1,62 @@+package io.onedev.server.model;++import java.util.Date;++import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++@Entity+@Table(+ indexes={@Index(columnList="g_issue_id"), @Index(columnList="g_user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_issue_id", "g_user_id"})}+)+public class IssueVote extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @ManyToOne+ @JoinColumn(nullable=false)+ private Issue issue;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn+ private User user;++ @Column(nullable=false)+ private Date date;++ public Issue getIssue() {+ return issue;+ }++ public void setIssue(Issue issue) {+ this.issue = issue;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ public Date getDate() {+ return date;+ }++ public void setDate(Date date) {+ this.date = date;+ }++ public String getAnchor() {+ return getClass().getSimpleName() + "-" + getId();+ }++}diff --git a/core/src/main/java/io/onedev/server/model/IssueWatch.java b/core/src/main/java/io/onedev/server/model/IssueWatch.javanew file mode 100644index 0000000000..e376c721a5--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/IssueWatch.java@@ -0,0 +1,66 @@+package io.onedev.server.model;++import javax.annotation.Nullable;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++@Entity+@Table(+ indexes={@Index(columnList="g_issue_id"), @Index(columnList="g_user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_issue_id", "g_user_id"})+})+public class IssueWatch extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Issue issue;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User user;++ private String reason;++ private boolean ignore;++ public Issue getIssue() {+ return issue;+ }++ public void setIssue(Issue issue) {+ this.issue = issue;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ @Nullable+ public String getReason() {+ return reason;+ }++ public void setReason(String reason) {+ this.reason = reason;+ }++ public boolean isIgnore() {+ return ignore;+ }++ public void setIgnore(boolean ignore) {+ this.ignore = ignore;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.javaindex 2092ff0e69..af46c50aa7 100644--- a/core/src/main/java/io/onedev/server/model/User.java+++ b/core/src/main/java/io/onedev/server/model/User.java@@ -87,6 +87,9 @@ public class User extends AbstractEntity implements AuthenticationInfo {@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<PullRequestWatch> requestWatches = new ArrayList<>();+ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<IssueWatch> issueWatches = new ArrayList<>();+@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<PullRequestTask> requestTasks = new ArrayList<>();diff --git a/core/src/main/java/io/onedev/server/web/page/base/BasePage.html b/core/src/main/java/io/onedev/server/web/page/base/BasePage.htmlindex 770eee35b2..ba102a6ac4 100644--- a/core/src/main/java/io/onedev/server/web/page/base/BasePage.html+++ b/core/src/main/java/io/onedev/server/web/page/base/BasePage.html@@ -22,7 +22,8 @@<div id="ajax-loading-overlay"><div></div></div><div wicket:id="keepSessionAlive" style="display:none;"></div><a id="websocket-error" href="javascript: location.reload();">- <span class="fa fa-warning"></span> Page is in error, refresh to recover</a>+ <span class="fa fa-warning"></span> Page is in error, refresh to recover+ </a><div wicket:id="rootComponents"></div></body></html>diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex 8908146494..cce7c417d9 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -319,7 +319,8 @@ form>.test-feedback {/* WEB SOCKET ERROR */#websocket-error {- display: none;+ z-index: 1000;+ display: none;position: fixed;left: 50%;top: 0;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.htmlindex 03d32fca40..1d646721a6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html@@ -18,7 +18,7 @@<wicket:child></wicket:child></div><div class="side">- <div wicket:id="nav" class="nav"></div>+ <div wicket:id="issueNav" class="nav"></div><div wicket:id="fields" class="fields"><table><tr wicket:id="fields">@@ -26,7 +26,16 @@<td class="values"><div wicket:id="values"></div></td></tr></table>- <a wicket:id="editFields" class="btn btn-default btn-sm"><i class="fa fa-pencil"></i> Edit</a>+ <a wicket:id="editFields"><i class="fa fa-pencil"></i> Edit</a>+ </div>+ <div wicket:id="votes" class="votes">+ <div class="head">+ <i class="fa fa-thumbs-o-up"></i> <span wicket:id="count"></span>+ <a wicket:id="vote" class="vote"><span wicket:id="label"></span></a>+ </div>+ <div class="body">+ <span wicket:id="voters"><a wicket:id="voter"></a></span> <span wicket:id="more">and more</span>+ </div></div><wicket:enclosure child="delete"><div>@@ -57,7 +66,7 @@<span wicket:id="title"></span><a wicket:id="edit" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a></wicket:fragment>- <wicket:fragment wicket:id="navFrag">+ <wicket:fragment wicket:id="issueNavFrag"><a wicket:id="prev" title="Previous issue" class="prev"><i class="fa fa-arrow-left"></i></a><span wicket:id="current"></span><a wicket:id="next" title="Next issue" class="next"><i class="fa fa-arrow-right"></i></a>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex cc66855a22..8f0cdaa17c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -4,6 +4,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.Collections;import java.util.Comparator;+import java.util.Date;import java.util.HashSet;import java.util.List;import java.util.Map;@@ -15,6 +16,7 @@ import javax.persistence.EntityNotFoundException;import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;import org.apache.wicket.Page;+import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;@@ -51,9 +53,12 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.IssueChangeManager;import io.onedev.server.manager.IssueFieldManager;import io.onedev.server.manager.IssueManager;+import io.onedev.server.manager.IssueVoteManager;import io.onedev.server.manager.VisitManager;import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueVote;import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.model.support.issue.PromptedField;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;@@ -62,6 +67,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.IssueStateLabel;+import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.modal.ModalLink;@@ -80,19 +86,22 @@ import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;+import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.QueryPosition;@SuppressWarnings("serial")public abstract class IssueDetailPage extends ProjectPage implements InputContext {+ private static final int MAX_DISPLAY_VOTERS = 20;+public static final String PARAM_ISSUE = "issue";private static final String ACTION_OPTIONS_ID = "actionOptions";private static final String TITLE_ID = "title";- private static final String NAV_ID = "nav";+ private static final String NAV_ID = "issueNav";private final IModel<Issue> issueModel;@@ -399,7 +408,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex* issue to cause it no longer matches the query. We will also decrease issue count* matching the query in this case*/- Fragment fragment = new Fragment(NAV_ID, "navFrag", this);+ Fragment fragment = new Fragment(NAV_ID, "issueNavFrag", this);fragment.add(new Link<Void>("prev") {@Override@@ -592,6 +601,111 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexadd(fieldsContainer);+ WebMarkupContainer votesContainer = new WebMarkupContainer("votes");+ votesContainer.setOutputMarkupId(true);++ votesContainer.add(new Label("count", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return String.valueOf(getIssue().getNumOfVotes());+ }++ }));++ AjaxLink<Void> voteLink = new AjaxLink<Void>("vote") {++ private IssueVote getVote(User user) {+ for (IssueVote vote: getIssue().getVotes()) {+ if (user.equals(vote.getUser()))+ return vote;+ }+ return null;+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (getLoginUser() != null) {+ IssueVote vote = getVote(getLoginUser());+ if (vote == null) {+ vote = new IssueVote();+ vote.setIssue(getIssue());+ vote.setUser(getLoginUser());+ vote.setDate(new Date());+ OneDev.getInstance(IssueVoteManager.class).save(vote);+ getIssue().getVotes().add(vote);+ } else {+ getIssue().getVotes().remove(vote);+ OneDev.getInstance(IssueVoteManager.class).delete(vote);+ }+ target.add(votesContainer);+ } else {+ throw new RestartResponseAtInterceptPageException(LoginPage.class);+ }+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ if (getLoginUser() != null) {+ if (getVote(getLoginUser()) != null)+ return "Unvote";+ else+ return "Vote";+ } else {+ return "Login to vote";+ }+ }++ }));+ }++ };+ votesContainer.add(voteLink);++ votesContainer.add(new ListView<IssueVote>("voters", new LoadableDetachableModel<List<IssueVote>>() {++ @Override+ protected List<IssueVote> load() {+ List<IssueVote> votes = new ArrayList<>(getIssue().getVotes());+ Collections.sort(votes, new Comparator<IssueVote>() {++ @Override+ public int compare(IssueVote o1, IssueVote o2) {+ return o2.getId().compareTo(o1.getId());+ }++ });+ if (votes.size() > MAX_DISPLAY_VOTERS)+ votes = votes.subList(0, MAX_DISPLAY_VOTERS);+ return votes;+ }++ }) {++ @Override+ protected void populateItem(ListItem<IssueVote> item) {+ item.add(new AvatarLink("voter", item.getModelObject().getUser()));+ }++ });++ votesContainer.add(new WebMarkupContainer("more") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getIssue().getVotes().size() > MAX_DISPLAY_VOTERS);+ }++ });++ add(votesContainer);+Link<Void> deleteLink = new Link<Void>("delete") {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.javaindex 2cebcac779..6a81d6024a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivitiesPage.java@@ -12,7 +12,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -39,10 +38,10 @@ import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.comment.ProjectAttachmentSupport;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;+import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.ActivityCallback;import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.ChangedActivity;import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.CommentedActivity;import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.IssueActivity;-import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.IssueCommentDeleted;import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.OpenedActivity;import io.onedev.server.web.page.security.LoginPage;@@ -79,27 +78,23 @@ public class IssueActivitiesPage extends IssueDetailPage {}private Component newActivityRow(String id, IssueActivity activity) {- WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity)) {-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);-- if (event.getPayload() instanceof IssueCommentDeleted) {- IssueCommentDeleted commentRemoved = (IssueCommentDeleted) event.getPayload();- remove();- commentRemoved.getHandler().appendJavaScript(String.format("$('#%s').remove();", getMarkupId()));- }- }-- };+ WebMarkupContainer row = new WebMarkupContainer(id, Model.of(activity));row.setOutputMarkupId(true);String anchor = activity.getAnchor();if (anchor != null)row.setMarkupId(anchor);- if (row.get("content") == null)- row.add(activity.render("content"));+ if (row.get("content") == null) {+ row.add(activity.render("content", new ActivityCallback() {++ @Override+ public void onDelete(AjaxRequestTarget target) {+ row.remove();+ target.appendJavaScript(String.format("$('#%s').remove();", row.getMarkupId()));+ }++ }));+ }row.add(new AvatarLink("avatar", User.getForDisplay(getIssue().getSubmitter(), getIssue().getSubmitterName())));@@ -215,6 +210,16 @@ public class IssueActivitiesPage extends IssueDetailPage {input.setModelObject("");+ @SuppressWarnings("deprecation")+ Component lastActivityRow = activitiesView.get(activitiesView.size()-1);+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), new CommentedActivity(comment));+ activitiesView.add(newActivityRow);++ String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",+ newActivityRow.getMarkupId(), lastActivityRow.getMarkupId());+ target.prependJavaScript(script);+ target.add(newActivityRow);+target.add(fragment);target.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivityAdded.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivityAdded.javanew file mode 100644index 0000000000..f218fed384--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueActivityAdded.java@@ -0,0 +1,21 @@+package io.onedev.server.web.page.project.issues.issuedetail.activities;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import io.onedev.server.web.page.project.issues.issuedetail.activities.activity.IssueActivity;+import io.onedev.server.web.util.AjaxPayload;++public class IssueActivityAdded extends AjaxPayload {++ private final IssueActivity activity;++ public IssueActivityAdded(IPartialPageRequestHandler handler, IssueActivity activity) {+ super(handler);+ this.activity = activity;+ }++ public IssueActivity getActivity() {+ return activity;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueCommentAdded.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueCommentAdded.javanew file mode 100644index 0000000000..f4d958e1be--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueCommentAdded.java@@ -0,0 +1,21 @@+package io.onedev.server.web.page.project.issues.issuedetail.activities;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import io.onedev.server.model.IssueComment;+import io.onedev.server.web.util.AjaxPayload;++public class IssueCommentAdded extends AjaxPayload {++ private final IssueComment comment;++ public IssueCommentAdded(IPartialPageRequestHandler handler, IssueComment comment) {+ super(handler);+ this.comment = comment;+ }++ public IssueComment getComment() {+ return comment;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueCommentDeleted.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueCommentDeleted.javanew file mode 100644index 0000000000..3b75111450--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueCommentDeleted.java@@ -0,0 +1,21 @@+package io.onedev.server.web.page.project.issues.issuedetail.activities;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import io.onedev.server.model.IssueComment;+import io.onedev.server.web.util.AjaxPayload;++public class IssueCommentDeleted extends AjaxPayload {++ private final IssueComment comment;++ public IssueCommentDeleted(IPartialPageRequestHandler handler, IssueComment comment) {+ super(handler);+ this.comment = comment;+ }++ public IssueComment getComment() {+ return comment;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueVoteAdded.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueVoteAdded.javanew file mode 100644index 0000000000..e322e12c67--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueVoteAdded.java@@ -0,0 +1,21 @@+package io.onedev.server.web.page.project.issues.issuedetail.activities;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import io.onedev.server.model.IssueVote;+import io.onedev.server.web.util.AjaxPayload;++public class IssueVoteAdded extends AjaxPayload {++ private final IssueVote vote;++ public IssueVoteAdded(IPartialPageRequestHandler handler, IssueVote vote) {+ super(handler);+ this.vote = vote;+ }++ public IssueVote getVote() {+ return vote;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueVoteDeleted.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueVoteDeleted.javanew file mode 100644index 0000000000..3c7eef1b06--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/IssueVoteDeleted.java@@ -0,0 +1,21 @@+package io.onedev.server.web.page.project.issues.issuedetail.activities;++import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++import io.onedev.server.model.IssueVote;+import io.onedev.server.web.util.AjaxPayload;++public class IssueVoteDeleted extends AjaxPayload {++ private final IssueVote vote;++ public IssueVoteDeleted(IPartialPageRequestHandler handler, IssueVote vote) {+ super(handler);+ this.vote = vote;+ }++ public IssueVote getVote() {+ return vote;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActivityCallback.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActivityCallback.javanew file mode 100644index 0000000000..1d2b794586--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ActivityCallback.java@@ -0,0 +1,11 @@+package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;++import java.io.Serializable;++import org.apache.wicket.ajax.AjaxRequestTarget;++public interface ActivityCallback extends Serializable {++ void onDelete(AjaxRequestTarget target);++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedActivity.javaindex af698cabe3..cab57fed9a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedActivity.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/ChangedActivity.java@@ -19,7 +19,7 @@ public class ChangedActivity implements IssueActivity {}@Override- public Panel render(String panelId) {+ public Panel render(String panelId, ActivityCallback callback) {return new ChangedPanel(panelId, new LoadableDetachableModel<IssueChange>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.javaindex 507630c206..acb469404d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedActivity.java@@ -19,7 +19,7 @@ public class CommentedActivity implements IssueActivity {}@Override- public Panel render(String panelId) {+ public Panel render(String panelId, ActivityCallback callback) {return new CommentedPanel(panelId, new LoadableDetachableModel<IssueComment>() {@Override@@ -27,7 +27,11 @@ public class CommentedActivity implements IssueActivity {return getComment();}- });+ }, callback);+ }++ public Long getCommentId() {+ return commentId;}public IssueComment getComment() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.javaindex 0e70e38d1e..5f72011924 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/CommentedPanel.java@@ -5,7 +5,6 @@ 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.event.Broadcast;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;@@ -35,8 +34,11 @@ import io.onedev.server.web.util.ajaxlistener.ConfirmListener;@SuppressWarnings("serial")class CommentedPanel extends GenericPanel<IssueComment> {- public CommentedPanel(String id, IModel<IssueComment> model) {+ private final ActivityCallback callback;++ public CommentedPanel(String id, IModel<IssueComment> model, ActivityCallback callback) {super(id, model);+ this.callback = callback;}@Override@@ -182,7 +184,7 @@ class CommentedPanel extends GenericPanel<IssueComment> {@Overridepublic void onClick(AjaxRequestTarget target) {OneDev.getInstance(IssueCommentManager.class).delete(getComment());- send(CommentedPanel.this, Broadcast.BUBBLE, new IssueCommentDeleted(target));+ callback.onDelete(target);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueActivity.javaindex 2eb0d2e2c0..50227e0ec1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueActivity.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueActivity.java@@ -11,7 +11,7 @@ public interface IssueActivity extends Serializable {Date getDate();- Panel render(String panelId);+ Panel render(String panelId, ActivityCallback callback);@NullableString getAnchor();diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueCommentDeleted.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueCommentDeleted.javadeleted file mode 100644index e054e3cd60..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/IssueCommentDeleted.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.issues.issuedetail.activities.activity;--import org.apache.wicket.ajax.AjaxRequestTarget;--import io.onedev.server.web.util.AjaxPayload;--public class IssueCommentDeleted extends AjaxPayload {-- public IssueCommentDeleted(AjaxRequestTarget target) {- super(target);- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedActivity.javaindex 6784b2f018..91a9549a13 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedActivity.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/activity/OpenedActivity.java@@ -19,7 +19,7 @@ public class OpenedActivity implements IssueActivity {}@Override- public Panel render(String panelId) {+ public Panel render(String panelId, ActivityCallback callback) {return new OpenedPanel(panelId, new LoadableDetachableModel<Issue>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.cssindex a251984ba0..96d8154b42 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/activities/issue-activities.css@@ -24,6 +24,10 @@#issue-detail>.main>.activities .activity>.head {color: #888;}+#issue-detail>.main>.activities .activity.VotedActivity .head {+ margin-top: 8px;+}+#issue-detail>.main>.activities .activity>.body {margin-top: 8px;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.cssindex 179e58e85e..5972e818ba 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css@@ -53,7 +53,15 @@#issue-detail>.side>.nav .next {right: 0;}-+#issue-detail>.side>.votes>.head a {+ margin-left: 8px;+}+#issue-detail>.side>.votes>.body {+ margin-top: 12px;+}+#issue-detail>.side>.votes>.body>* {+ margin-right: 8px;+}#issue-detail>.side {position: fixed;@@ -84,7 +92,6 @@padding-bottom: 0;}#issue-detail>.side .fields .name {- font-weight: bold;line-height: 20px;white-space: nowrap;padding-right: 20px;@@ -95,5 +102,6 @@padding: 3px 6px;}#issue-detail>.side .fields>a {+ display: block;margin-top: 12px;}diff --git a/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.javaindex 3703a9e127..73c4c67fbf 100644--- a/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java+++ b/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java@@ -6,6 +6,7 @@ import javax.inject.Singleton;import io.onedev.launcher.loader.Listen;import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.model.Issue;+import io.onedev.server.web.util.WicketUtils;@Singletonpublic class IssueEventBroadcaster {@@ -19,7 +20,7 @@ public class IssueEventBroadcaster {@Listenpublic void on(IssueEvent event) {- webSocketManager.onObservableChanged(Issue.getWebSocketObservable(event.getIssue().getId()), null);+ webSocketManager.onObservableChanged(Issue.getWebSocketObservable(event.getIssue().getId()), WicketUtils.getPageKey());}}\ No newline at end of file