Skip to content

The Unified and Autonomous Development Platform

Event post for issue state change

Robin Shenfc7f5fbdf69a
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.java
index bd7bc3eeb8..cfaad8a569 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="opened")
+@Editable(name="commented")
public class IssueChanged extends IssueEvent {
private final IssueChange change;
@@ -22,7 +22,7 @@ public class IssueChanged extends IssueEvent {
@Override
public User getUser() {
- return User.getForDisplay(change.getUser(), change.getUserName());
+ return change.getUser();
}
@Override
diff --git a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java
index 1208009076..692761a4f7 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java
@@ -4,6 +4,8 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
+import javax.annotation.Nullable;
+
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.support.issue.PromptedField;
@@ -15,6 +17,9 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {
void changeDescription(Issue issue, String oldDescription);
- void changeFields(Issue issue, Serializable fieldBean, Map<String, PromptedField> prevFields, Collection<String> promptedFields);
+ void changeFields(Issue issue, Serializable fieldBean,
+ Map<String, PromptedField> prevFields, Collection<String> promptedFields);
+ void changeState(Issue issue, Serializable fieldBean, @Nullable String commentContent,
+ String prevState, Map<String, PromptedField> prevFields, Collection<String> promptedFields);
}
diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.java
index 2582d768d8..9be70be758 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java
@@ -19,7 +19,7 @@ public interface IssueManager extends EntityManager<Issue> {
@Nullable
Issue find(Project target, long number);
- void save(Issue issue, Serializable fieldBean, Collection<String> promptedFields);
+ void open(Issue issue, Serializable fieldBean, Collection<String> promptedFields);
void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java
index 9ef24c9f63..fd05795340 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java
@@ -49,10 +49,10 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Cod
super.save(relation);
CodeComment comment = relation.getComment();
PullRequest request = relation.getRequest();
- if (request.getLastEvent() == null || comment.getDate().after(request.getLastEvent().getDate())) {
+ if (request.getLastActivity() == null || comment.getDate().after(request.getLastActivity().getDate())) {
PullRequestCodeCommented event = new PullRequestCodeCommented(request, comment, passive);
listenerRegistry.post(event);
- request.setLastEvent(event);
+ request.setLastActivity(event);
pullRequestManager.save(request);
}
}
@@ -81,7 +81,7 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Cod
PullRequestCodeCommentReplied pullRequestCodeCommentReplied = new PullRequestCodeCommentReplied(
relation.getRequest(), event.getReply(), !relation.getRequest().equals(event.getRequest()));
listenerRegistry.post(pullRequestCodeCommentReplied);
- relation.getRequest().setLastEvent(pullRequestCodeCommentReplied);
+ relation.getRequest().setLastActivity(pullRequestCodeCommentReplied);
pullRequestManager.save(relation.getRequest());
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java
index db21f00ecf..cd1587c7c5 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java
@@ -38,7 +38,7 @@ public class DefaultCodeCommentReplyManager extends AbstractEntityManager<CodeCo
if (isNew) {
CodeCommentReplied event = new CodeCommentReplied(reply, request);
reply.getComment().setCompareContext(compareContext);
- reply.getComment().setLastEvent(event);
+ reply.getComment().setLastActivity(event);
listenerRegistry.post(event);
codeCommentManager.save(reply.getComment());
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
index bd2d888e9b..f653e3b6f6 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
@@ -5,17 +5,22 @@ import java.util.Collection;
import java.util.Date;
import java.util.Map;
+import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
+import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.server.event.issue.IssueChanged;
import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueFieldManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueField;
+import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.issue.PromptedField;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -32,43 +37,63 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
private final IssueFieldManager issueFieldManager;
+ private final ListenerRegistry listenerRegistry;
+
@Inject
- public DefaultIssueChangeManager(Dao dao, IssueManager issueManager, IssueFieldManager issueFieldManager) {
+ public DefaultIssueChangeManager(Dao dao, IssueManager issueManager,
+ IssueFieldManager issueFieldManager, ListenerRegistry listenerRegistry) {
super(dao);
this.issueManager = issueManager;
this.issueFieldManager = issueFieldManager;
+ this.listenerRegistry = listenerRegistry;
}
@Transactional
@Override
public void changeTitle(Issue issue, String prevTitle) {
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setAction("changed title");
+ lastActivity.setDate(new Date());
+ lastActivity.setUser(SecurityUtils.getUser());
issueManager.save(issue);
- IssueChange edit = new IssueChange();
- edit.setIssue(issue);
- edit.setProperty("title");
- edit.setDate(new Date());
- edit.setUser(SecurityUtils.getUser());
- edit.setPrevContent(prevTitle);
- edit.setContent(issue.getTitle());
- save(edit);
+
+ IssueChange change = new IssueChange();
+ change.setIssue(issue);
+ change.setProperty("title");
+ change.setDate(new Date());
+ change.setUser(SecurityUtils.getUser());
+ change.setPrevContent(prevTitle);
+ change.setContent(issue.getTitle());
+ save(change);
+
+ listenerRegistry.post(new IssueChanged(change));
}
@Transactional
@Override
public void changeDescription(Issue issue, String prevDescription) {
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setAction("changed description");
+ lastActivity.setDate(new Date());
+ lastActivity.setUser(SecurityUtils.getUser());
issueManager.save(issue);
- IssueChange edit = new IssueChange();
- edit.setIssue(issue);
- edit.setProperty("description");
- edit.setDate(new Date());
- edit.setUser(SecurityUtils.getUser());
- edit.setPrevContent(prevDescription);
- edit.setContent(issue.getDescription());
- save(edit);
+
+ IssueChange change = new IssueChange();
+ change.setIssue(issue);
+ change.setProperty("description");
+ change.setDate(new Date());
+ change.setUser(SecurityUtils.getUser());
+ change.setPrevContent(prevDescription);
+ change.setContent(issue.getDescription());
+ save(change);
+
+ listenerRegistry.post(new IssueChanged(change));
}
- private String toString(Map<String, PromptedField> fields) {
+ private String toString(@Nullable String state, Map<String, PromptedField> fields) {
StringBuilder builder = new StringBuilder();
+ if (state != null)
+ builder.append("State: " + state).append("\n");
for (Map.Entry<String, PromptedField> entry: fields.entrySet()) {
builder.append(entry.getKey()).append(": ");
builder.append(StringUtils.join(entry.getValue().getValues())).append("\n");
@@ -80,13 +105,19 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Override
public void changeFields(Issue issue, Serializable fieldBean, Map<String, PromptedField> prevFields,
Collection<String> promptedFields) {
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setAction("changed custom fields");
+ lastActivity.setDate(new Date());
+ lastActivity.setUser(SecurityUtils.getUser());
+ issueManager.save(issue);
+
issueFieldManager.writeFields(issue, fieldBean, promptedFields);
- IssueChange edit = new IssueChange();
- edit.setIssue(issue);
- edit.setProperty("custom fields");
- edit.setDate(new Date());
- edit.setUser(SecurityUtils.getUser());
- edit.setPrevContent(toString(prevFields));
+ IssueChange change = new IssueChange();
+ change.setIssue(issue);
+ change.setProperty("custom fields");
+ change.setDate(new Date());
+ change.setUser(SecurityUtils.getUser());
+ change.setPrevContent(toString(null, prevFields));
getSession().flush();
@@ -94,8 +125,50 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
criteria.add(Restrictions.eq("issue", issue));
issue.setFields(dao.findAll(criteria));
- edit.setContent(toString(issue.getPromptedFields()));
- save(edit);
+ change.setContent(toString(null, issue.getPromptedFields()));
+ save(change);
+
+ listenerRegistry.post(new IssueChanged(change));
+ }
+
+ @Transactional
+ @Override
+ public void changeState(Issue issue, Serializable fieldBean, @Nullable String commentContent,
+ String prevState, Map<String, PromptedField> prevFields, Collection<String> promptedFields) {
+ long time = System.currentTimeMillis();
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setAction("changed state");
+ lastActivity.setDate(new Date(time));
+ lastActivity.setUser(SecurityUtils.getUser());
+ issueManager.save(issue);
+
+ if (commentContent != null) {
+ IssueComment comment = new IssueComment();
+ comment.setIssue(issue);
+ comment.setContent(commentContent);
+ comment.setUser(SecurityUtils.getUser());
+ comment.setDate(new Date(time-1));
+ dao.persist(comment);
+ }
+
+ issueFieldManager.writeFields(issue, fieldBean, promptedFields);
+ IssueChange change = new IssueChange();
+ change.setIssue(issue);
+ change.setProperty("state");
+ change.setDate(new Date(time));
+ change.setUser(SecurityUtils.getUser());
+ change.setPrevContent(toString(prevState, prevFields));
+
+ getSession().flush();
+
+ EntityCriteria<IssueField> criteria = EntityCriteria.of(IssueField.class);
+ criteria.add(Restrictions.eq("issue", issue));
+ issue.setFields(dao.findAll(criteria));
+
+ change.setContent(toString(issue.getState(), issue.getPromptedFields()));
+ save(change);
+
+ listenerRegistry.post(new IssueChanged(change));
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java
index 467a4b60be..666af6bc1f 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java
@@ -7,6 +7,8 @@ import io.onedev.launcher.loader.ListenerRegistry;
import io.onedev.server.event.issue.IssueCommented;
import io.onedev.server.manager.IssueCommentManager;
import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.support.LastActivity;
+import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
@@ -22,6 +24,7 @@ public class DefaultIssueCommentManager extends AbstractEntityManager<IssueComme
this.listenerRegistry = listenerRegistry;
}
+ @Transactional
@Override
public void save(IssueComment comment) {
boolean isNew = comment.isNew();
@@ -29,7 +32,20 @@ public class DefaultIssueCommentManager extends AbstractEntityManager<IssueComme
if (isNew) {
IssueCommented event = new IssueCommented(comment);
listenerRegistry.post(event);
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setUser(comment.getUser());
+ lastActivity.setDate(comment.getDate());
+ lastActivity.setAction("commented");
+ comment.getIssue().setLastActivity(lastActivity);
+ comment.getIssue().setNumOfComments(comment.getIssue().getNumOfComments()+1);
}
}
+ @Transactional
+ @Override
+ public void delete(IssueComment comment) {
+ super.delete(comment);
+ comment.getIssue().setNumOfComments(comment.getIssue().getNumOfComments()-1);
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
index eb0326a016..2229c494e5 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
@@ -29,6 +29,7 @@ import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.issue.query.IssueCriteria;
import io.onedev.server.model.support.issue.query.IssueQuery;
import io.onedev.server.model.support.issue.query.QueryBuildContext;
@@ -149,15 +150,16 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Transactional
@Override
- public void save(Issue issue, Serializable fieldBean, Collection<String> promptedFields) {
- boolean isNew = issue.isNew();
- if (isNew)
- issue.setNumber(getNextNumber(issue.getProject()));
+ public void open(Issue issue, Serializable fieldBean, Collection<String> promptedFields) {
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setAction("submitted");
+ lastActivity.setUser(issue.getSubmitter());
+ lastActivity.setDate(issue.getSubmitDate());
+ issue.setLastActivity(lastActivity);
+ issue.setNumber(getNextNumber(issue.getProject()));
save(issue);
issueFieldManager.writeFields(issue, fieldBean, promptedFields);
-
- if (isNew)
- listenerRegistry.post(new IssueOpened(issue));
+ listenerRegistry.post(new IssueOpened(issue));
}
private long getNextNumber(Project project) {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java
index 664759e8b4..308ecca139 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java
@@ -384,12 +384,12 @@ public class DefaultNotificationManager implements NotificationManager {
if (!watch.isIgnore() && !watch.getUser().equals(event.getUser())
&& (!(event instanceof PullRequestUpdated)
|| !watch.getUser().equals(request.getSubmitter()))) {
- if (request.getLastEvent() == null) {
+ if (request.getLastActivity() == null) {
usersToNotify.add(watch.getUser());
} else {
Date visitDate = visitInfoManager.getPullRequestVisitDate(watch.getUser(), request);
- if (visitDate == null || visitDate.getTime()<request.getLastEvent().getDate().getTime()) {
- if (!request.getLastEvent().getType().equals(eventType)) {
+ if (visitDate == null || visitDate.getTime()<request.getLastActivity().getDate().getTime()) {
+ if (!request.getLastActivity().getAction().equals(eventType)) {
usersToNotify.add(watch.getUser());
}
} else {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java
index 1ec7b0b52e..cc75a7d8d1 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java
@@ -8,7 +8,7 @@ import io.onedev.server.event.pullrequest.PullRequestCommented;
import io.onedev.server.manager.PullRequestCommentManager;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.model.support.LastEvent;
+import io.onedev.server.model.support.LastActivity;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
@@ -40,11 +40,11 @@ public class DefaultPullRequestCommentManager extends AbstractEntityManager<Pull
PullRequestCommented event = new PullRequestCommented(comment);
listenerRegistry.post(event);
- LastEvent lastEvent = new LastEvent();
+ LastActivity lastEvent = new LastActivity();
lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getDisplayName(event.getClass()));
+ lastEvent.setAction(EditableUtils.getDisplayName(event.getClass()));
lastEvent.setUser(event.getUser());
- comment.getRequest().setLastEvent(lastEvent);
+ comment.getRequest().setLastActivity(lastEvent);
pullRequestManager.save(event.getRequest());
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
index dc60a26963..cb4996f953 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
@@ -162,7 +162,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
statusChange.setUser(userManager.getCurrent());
pullRequestStatusChangeManager.save(statusChange);
- request.setLastEvent(statusChange);
+ request.setLastActivity(statusChange);
save(request);
}
}
@@ -183,7 +183,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
statusChange.setUser(userManager.getCurrent());
pullRequestStatusChangeManager.save(statusChange);
- request.setLastEvent(statusChange);
+ request.setLastActivity(statusChange);
save(request);
}
}
@@ -202,7 +202,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
statusChange.setUser(user);
pullRequestStatusChangeManager.save(statusChange);
- request.setLastEvent(statusChange);
+ request.setLastActivity(statusChange);
save(request);
checkAsync(request);
}
@@ -227,7 +227,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
statusChange.setUser(user);
pullRequestStatusChangeManager.save(statusChange);
- request.setLastEvent(statusChange);
+ request.setLastActivity(statusChange);
save(request);
}
@@ -378,7 +378,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
statusChange.setRequest(request);
statusChange.setType(Type.MERGED);
pullRequestStatusChangeManager.save(statusChange);
- request.setLastEvent(statusChange);
+ request.setLastActivity(statusChange);
save(request);
}
@@ -702,7 +702,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
pullRequestStatusChangeManager.save(statusChange);
- request.setLastEvent(statusChange);
+ request.setLastActivity(statusChange);
save(request);
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java
index 0e1f514999..ae3cbc00d6 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java
@@ -22,7 +22,7 @@ import io.onedev.server.manager.PullRequestUpdateManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
-import io.onedev.server.model.support.LastEvent;
+import io.onedev.server.model.support.LastActivity;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -90,10 +90,10 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullR
PullRequestUpdated event = new PullRequestUpdated(update);
listenerRegistry.post(event);
- LastEvent lastEvent = new LastEvent();
+ LastActivity lastEvent = new LastActivity();
lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getDisplayName(event.getClass()));
- request.setLastEvent(lastEvent);
+ lastEvent.setAction(EditableUtils.getDisplayName(event.getClass()));
+ request.setLastActivity(lastEvent);
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewInvitationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewInvitationManager.java
index 1b47f6a00d..a7376a8422 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewInvitationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewInvitationManager.java
@@ -55,7 +55,7 @@ public class DefaultReviewInvitationManager extends AbstractEntityManager<Review
statusChange.setNote("User '" + reviewer.getDisplayName() + "' is removed from reviewer list");
pullRequestStatusChangeManager.save(statusChange, invitation);
- request.setLastEvent(statusChange);
+ request.setLastActivity(statusChange);
pullRequestManager.save(request);
return true;
}
@@ -76,7 +76,7 @@ public class DefaultReviewInvitationManager extends AbstractEntityManager<Review
statusChange.setUser(SecurityUtils.getUser());
pullRequestStatusChangeManager.save(statusChange, invitation);
- request.setLastEvent(statusChange);
+ request.setLastActivity(statusChange);
pullRequestManager.save(request);
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewManager.java
index 9af65bda03..b258b686b4 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewManager.java
@@ -61,7 +61,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
statusChange.setUser(review.getUser());
pullRequestStatusChangeManager.save(statusChange);
- review.getRequest().setLastEvent(statusChange);
+ review.getRequest().setLastActivity(statusChange);
pullRequestManager.save(review.getRequest());
}
@@ -93,7 +93,7 @@ public class DefaultReviewManager extends AbstractEntityManager<Review> implemen
statusChange.setUser(userManager.getCurrent());
pullRequestStatusChangeManager.save(statusChange);
- request.setLastEvent(statusChange);
+ request.setLastActivity(statusChange);
pullRequestManager.save(request);
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
index 38d25f233a..86f009b218 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
@@ -115,10 +115,10 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
query.setParameter("closedByName", user.getDisplayName());
query.executeUpdate();
- query = getSession().createQuery("update PullRequest set lastEvent.user=null, "
- + "lastEvent.userName=:lastEventUserName where lastEvent.user=:lastEventUser");
- query.setParameter("lastEventUser", user);
- query.setParameter("lastEventUserName", user.getDisplayName());
+ query = getSession().createQuery("update PullRequest set lastActivity.user=null, "
+ + "lastActivity.userName=:lastActivityUserName where lastActivity.user=:lastActivityUser");
+ query.setParameter("lastActivityUser", user);
+ query.setParameter("lastActivityUserName", user.getDisplayName());
query.executeUpdate();
query = getSession().createQuery("update PullRequestStatusChange set user=null, userName=:userName where user=:user");
@@ -141,10 +141,10 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
query.setParameter("userName", user.getDisplayName());
query.executeUpdate();
- query = getSession().createQuery("update CodeComment set lastEvent.user=null, "
- + "lastEvent.userName=:lastEventUserName where lastEvent.user=:lastEventUser");
- query.setParameter("lastEventUser", user);
- query.setParameter("lastEventUserName", user.getDisplayName());
+ query = getSession().createQuery("update CodeComment set lastActivity.user=null, "
+ + "lastActivity.userName=:lastActivityUserName where lastActivity.user=:lastActivityUser");
+ query.setParameter("lastActivityUser", user);
+ query.setParameter("lastActivityUserName", user.getDisplayName());
query.executeUpdate();
query = getSession().createQuery("update CodeCommentReply set user=null, userName=:userName where user=:user");
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultVerificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultVerificationManager.java
index 4fa444f9fb..1ae78224e8 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultVerificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultVerificationManager.java
@@ -128,7 +128,7 @@ public class DefaultVerificationManager extends AbstractEnvironmentManager imple
listenerRegistry.post(event);
- request.setLastEvent(event);
+ request.setLastActivity(event);
pullRequestManager.save(request);
}
diff --git a/core/src/main/java/io/onedev/server/model/CodeComment.java b/core/src/main/java/io/onedev/server/model/CodeComment.java
index 387e131c77..45d218f06b 100644
--- a/core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -39,7 +39,7 @@ import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.VisitManager;
import io.onedev.server.model.support.CompareContext;
-import io.onedev.server.model.support.LastEvent;
+import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.model.support.TextRange;
import io.onedev.server.security.SecurityUtils;
@@ -82,7 +82,7 @@ public class CodeComment extends AbstractEntity {
private Date date = new Date();
@Embedded
- private LastEvent lastEvent;
+ private LastActivity lastActivity;
@Embedded
private MarkPos markPos;
@@ -187,20 +187,20 @@ public class CodeComment extends AbstractEntity {
this.compareContext = compareContext;
}
- public LastEvent getLastEvent() {
- return lastEvent;
+ public LastActivity getLastActivity() {
+ return lastActivity;
}
- public void setLastEvent(LastEvent lastEvent) {
- this.lastEvent = lastEvent;
+ public void setLastActivity(LastActivity lastActivity) {
+ this.lastActivity = lastActivity;
}
- public void setLastEvent(CodeCommentEvent event) {
- LastEvent lastEvent = new LastEvent();
- lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getDisplayName(event.getClass()));
- lastEvent.setUser(event.getUser());
- setLastEvent(lastEvent);
+ public void setLastActivity(CodeCommentEvent event) {
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setDate(event.getDate());
+ lastActivity.setAction(EditableUtils.getDisplayName(event.getClass()));
+ lastActivity.setUser(event.getUser());
+ setLastActivity(lastActivity);
}
public boolean isVisitedAfter(Date date) {
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index 7342e59fb6..9448199163 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -12,6 +12,7 @@ import java.util.UUID;
import javax.annotation.Nullable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Index;
@@ -29,6 +30,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.manager.VisitManager;
+import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.Referenceable;
import io.onedev.server.model.support.issue.PromptedField;
import io.onedev.server.security.SecurityUtils;
@@ -36,6 +38,10 @@ import io.onedev.server.util.editable.annotation.Editable;
import io.onedev.server.util.editable.annotation.Markdown;
import io.onedev.server.util.inputspec.InputSpec;
+/**
+ * @author robin
+ *
+ */
@Entity
@Table(
indexes={
@@ -43,7 +49,7 @@ import io.onedev.server.util.inputspec.InputSpec;
@Index(columnList="title"), @Index(columnList="noSpaceTitle"),
@Index(columnList="number"), @Index(columnList="numberStr"),
@Index(columnList="submitDate"), @Index(columnList="g_submitter_id"),
- @Index(columnList="votes")})
+ @Index(columnList="numOfVotes"), @Index(columnList="numOfComments")})
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
public class Issue extends AbstractEntity implements Referenceable {
@@ -66,6 +72,8 @@ public class Issue extends AbstractEntity implements Referenceable {
public static final String VOTES = "Votes";
+ public static final String COMMENTS = "Comments";
+
static {
BUILTIN_FIELDS.put(NUMBER, "number");
BUILTIN_FIELDS.put(STATE, "state");
@@ -73,7 +81,8 @@ public class Issue extends AbstractEntity implements Referenceable {
BUILTIN_FIELDS.put(DESCRIPTION, "description");
BUILTIN_FIELDS.put(SUBMITTER, "submitter");
BUILTIN_FIELDS.put(SUBMIT_DATE, "submitDate");
- BUILTIN_FIELDS.put(VOTES, "votes");
+ BUILTIN_FIELDS.put(VOTES, "numOfVotes");
+ BUILTIN_FIELDS.put(COMMENTS, "numOfComments");
}
@Version
@@ -101,7 +110,9 @@ public class Issue extends AbstractEntity implements Referenceable {
@Column(nullable=false)
private long submitDate;
- private int votes;
+ private int numOfVotes;
+
+ private int numOfComments;
@Column(nullable=false)
private String uuid = UUID.randomUUID().toString();
@@ -116,6 +127,9 @@ public class Issue extends AbstractEntity implements Referenceable {
@Column(nullable=false)
private String noSpaceTitle;
+ @Embedded
+ private LastActivity lastActivity;
+
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
private Collection<IssueField> fields = new ArrayList<>();
@@ -229,12 +243,20 @@ public class Issue extends AbstractEntity implements Referenceable {
this.changes = changes;
}
- public int getVotes() {
- return votes;
+ public int getNumOfVotes() {
+ return numOfVotes;
}
- public void setVotes(int votes) {
- this.votes = votes;
+ public void setNumOfVotes(int numOfVotes) {
+ this.numOfVotes = numOfVotes;
+ }
+
+ public int getNumOfComments() {
+ return numOfComments;
+ }
+
+ public void setNumOfComments(int numOfComments) {
+ this.numOfComments = numOfComments;
}
public Collection<IssueField> getFields() {
@@ -246,6 +268,14 @@ public class Issue extends AbstractEntity implements Referenceable {
promptedFields = null;
}
+ public LastActivity getLastActivity() {
+ return lastActivity;
+ }
+
+ public void setLastActivity(LastActivity lastActivity) {
+ this.lastActivity = lastActivity;
+ }
+
public boolean isVisitedAfter(Date date) {
User user = SecurityUtils.getUser();
if (user != null) {
diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.java
index fcd60d11be..cf879eb232 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -48,7 +48,7 @@ import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.manager.VisitManager;
import io.onedev.server.model.support.CloseInfo;
import io.onedev.server.model.support.CompareContext;
-import io.onedev.server.model.support.LastEvent;
+import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.MergePreview;
import io.onedev.server.model.support.MergeStrategy;
import io.onedev.server.model.support.ProjectAndBranch;
@@ -120,10 +120,10 @@ public class PullRequest extends AbstractEntity implements Referenceable {
private String headCommitHash;
@Embedded
- private LastEvent lastEvent;
+ private LastActivity lastActivity;
@Column(nullable=true)
- private Date lastCodeCommentEventDate;
+ private Date lastCodeCommentActivityDate;
// used for number search in markdown editor
@Column(nullable=false)
@@ -685,20 +685,20 @@ public class PullRequest extends AbstractEntity implements Referenceable {
}
}
- public LastEvent getLastEvent() {
- return lastEvent;
+ public LastActivity getLastActivity() {
+ return lastActivity;
}
- public void setLastEvent(LastEvent lastEvent) {
- this.lastEvent = lastEvent;
+ public void setLastActivity(LastActivity lastActivity) {
+ this.lastActivity = lastActivity;
}
- public Date getLastCodeCommentEventDate() {
- return lastCodeCommentEventDate;
+ public Date getLastCodeCommentActivityDate() {
+ return lastCodeCommentActivityDate;
}
- public void setLastCodeCommentEventDate(Date lastCodeCommentEventDate) {
- this.lastCodeCommentEventDate = lastCodeCommentEventDate;
+ public void setLastCodeCommentActivityDate(Date lastCodeCommentActivityDate) {
+ this.lastCodeCommentActivityDate = lastCodeCommentActivityDate;
}
public boolean isVisitedAfter(Date date) {
@@ -737,29 +737,29 @@ public class PullRequest extends AbstractEntity implements Referenceable {
return mergedIntoTarget;
}
- public void setLastEvent(PullRequestStatusChange statusChange) {
- LastEvent lastEvent = new LastEvent();
- lastEvent.setDate(statusChange.getDate());
- lastEvent.setType(statusChange.getType().getName());
- lastEvent.setUser(statusChange.getUser());
- setLastEvent(lastEvent);
+ public void setLastActivity(PullRequestStatusChange statusChange) {
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setDate(statusChange.getDate());
+ lastActivity.setAction(statusChange.getType().getName());
+ lastActivity.setUser(statusChange.getUser());
+ setLastActivity(lastActivity);
}
- public void setLastEvent(PullRequestCodeCommentEvent event) {
- LastEvent lastEvent = new LastEvent();
- lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getDisplayName(event.getClass()));
- lastEvent.setUser(event.getUser());
- setLastEvent(lastEvent);
- setLastCodeCommentEventDate(event.getDate());
+ public void setLastActivity(PullRequestCodeCommentEvent event) {
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setDate(event.getDate());
+ lastActivity.setAction(EditableUtils.getDisplayName(event.getClass()));
+ lastActivity.setUser(event.getUser());
+ setLastActivity(lastActivity);
+ setLastCodeCommentActivityDate(event.getDate());
}
- public void setLastEvent(PullRequestVerificationEvent event) {
- LastEvent lastEvent = new LastEvent();
- lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getDisplayName(event.getClass()));
- lastEvent.setUser(event.getUser());
- setLastEvent(lastEvent);
+ public void setLastActivity(PullRequestVerificationEvent event) {
+ LastActivity lastActivity = new LastActivity();
+ lastActivity.setDate(event.getDate());
+ lastActivity.setAction(EditableUtils.getDisplayName(event.getClass()));
+ lastActivity.setUser(event.getUser());
+ setLastActivity(lastActivity);
}
@Nullable
diff --git a/core/src/main/java/io/onedev/server/model/support/LastEvent.java b/core/src/main/java/io/onedev/server/model/support/LastActivity.java
similarity index 73%
rename from core/src/main/java/io/onedev/server/model/support/LastEvent.java
rename to core/src/main/java/io/onedev/server/model/support/LastActivity.java
index 9b1e762d90..93e80e0b5d 100644
--- a/core/src/main/java/io/onedev/server/model/support/LastEvent.java
+++ b/core/src/main/java/io/onedev/server/model/support/LastActivity.java
@@ -13,29 +13,29 @@ import javax.persistence.ManyToOne;
import io.onedev.server.model.User;
@Embeddable
-public class LastEvent implements Serializable {
+public class LastActivity implements Serializable {
private static final long serialVersionUID = 1L;
@ManyToOne(fetch=FetchType.LAZY)
- @JoinColumn(name="LAST_EVENT_USER")
+ @JoinColumn(name="LAST_ACT_USER")
private User user;
- @Column(name="LAST_EVENT_USER_NAME")
+ @Column(name="LAST_ACT_USER_NAME")
private String userName;
- @Column(name="LAST_EVENT_TYPE")
- private String type;
+ @Column(name="LAST_ACT_ACTION")
+ private String action;
- @Column(name="LAST_EVENT_DATE")
+ @Column(name="LAST_ACT_DATE")
private Date date;
- public String getType() {
- return type;
+ public String getAction() {
+ return action;
}
- public void setType(String type) {
- this.type = type;
+ public void setAction(String action) {
+ this.action = action;
}
public Date getDate() {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/CommentsCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/CommentsCriteria.java
new file mode 100644
index 0000000000..1ad8753538
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/CommentsCriteria.java
@@ -0,0 +1,34 @@
+package io.onedev.server.model.support.issue.query;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+
+public class CommentsCriteria extends IssueCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public CommentsCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(QueryBuildContext context) {
+ Path<Integer> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.COMMENTS));
+ if (operator == IssueQueryLexer.Is)
+ return context.getBuilder().equal(attribute, value);
+ else if (operator == IssueQueryLexer.IsNot)
+ return context.getBuilder().notEqual(attribute, value);
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return context.getBuilder().greaterThan(attribute, value);
+ else
+ return context.getBuilder().lessThan(attribute, value);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
index d55ec9b342..06336f1a43 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
@@ -278,7 +278,9 @@ public class IssueQuery implements Serializable {
if (fieldName.equals(Issue.STATE)) {
return new StateCriteria(value, operator);
} else if (fieldName.equals(Issue.VOTES)) {
- return new VoteCriteria(getIntValue(value), operator);
+ return new VotesCriteria(getIntValue(value), operator);
+ } else if (fieldName.equals(Issue.COMMENTS)) {
+ return new CommentsCriteria(getIntValue(value), operator);
} else if (fieldName.equals(Issue.NUMBER)) {
return new NumberCriteria(getIntValue(value), operator);
} else if (fieldName.equals(Issue.SUBMITTER)) {
@@ -310,7 +312,9 @@ public class IssueQuery implements Serializable {
case IssueQueryLexer.IsLessThan:
case IssueQueryLexer.IsGreaterThan:
if (fieldName.equals(Issue.VOTES)) {
- return new VoteCriteria(getIntValue(value), operator);
+ return new VotesCriteria(getIntValue(value), operator);
+ } else if (fieldName.equals(Issue.COMMENTS)) {
+ return new CommentsCriteria(getIntValue(value), operator);
} else if (fieldName.equals(Issue.NUMBER)) {
return new NumberCriteria(getIntValue(value), operator);
} else {
@@ -349,7 +353,8 @@ public class IssueQuery implements Serializable {
List<IssueSort> issueSorts = new ArrayList<>();
for (OrderContext order: queryContext.order()) {
String fieldName = getValue(order.Quoted().getText());
- if (!fieldName.equals(Issue.SUBMIT_DATE) && !fieldName.equals(Issue.VOTES) && !fieldName.equals(Issue.NUMBER)) {
+ if (!fieldName.equals(Issue.SUBMIT_DATE) && !fieldName.equals(Issue.VOTES)
+ && !fieldName.equals(Issue.COMMENTS) && !fieldName.equals(Issue.NUMBER)) {
InputSpec field = project.getIssueWorkflow().getField(fieldName);
if (!(field instanceof ChoiceInput) && !(field instanceof DateInput)
&& !(field instanceof NumberInput)) {
@@ -411,6 +416,7 @@ public class IssueQuery implements Serializable {
case IssueQueryLexer.IsNot:
if (!fieldName.equals(Issue.STATE)
&& !fieldName.equals(Issue.VOTES)
+ && !fieldName.equals(Issue.COMMENTS)
&& !fieldName.equals(Issue.SUBMITTER)
&& !fieldName.equals(Issue.NUMBER)
&& !(field instanceof IssueChoiceInput)
@@ -426,6 +432,7 @@ public class IssueQuery implements Serializable {
case IssueQueryLexer.IsLessThan:
case IssueQueryLexer.IsGreaterThan:
if (!fieldName.equals(Issue.VOTES)
+ && !fieldName.equals(Issue.COMMENTS)
&& !fieldName.equals(Issue.NUMBER)
&& !(field instanceof NumberInput)
&& !(field instanceof ChoiceInput))
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.java
index 891c1e4a92..9f7d840013 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.java
@@ -23,7 +23,7 @@ public class IssueSort implements Serializable {
public enum Direction {ASCENDING, DESCENDING};
- private static List<String> BUILTIN_FIELDS = Lists.newArrayList("State", "Submit Date", "Votes");
+ private static List<String> BUILTIN_FIELDS = Lists.newArrayList("State", "Submit Date", "Votes", "Comments");
private String field;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/VoteCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/VotesCriteria.java
similarity index 89%
rename from core/src/main/java/io/onedev/server/model/support/issue/query/VoteCriteria.java
rename to core/src/main/java/io/onedev/server/model/support/issue/query/VotesCriteria.java
index 94dadcbffd..8cbd92042b 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/VoteCriteria.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/VotesCriteria.java
@@ -5,7 +5,7 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
-public class VoteCriteria extends IssueCriteria {
+public class VotesCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
@@ -13,7 +13,7 @@ public class VoteCriteria extends IssueCriteria {
private final int value;
- public VoteCriteria(int value, int operator) {
+ public VotesCriteria(int value, int operator) {
this.operator = operator;
this.value = value;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
index 02afaed3af..58dec68edf 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
@@ -147,7 +147,7 @@ public class IssueWorkflow implements Serializable, InputContext {
StateSpec assigned = new StateSpec();
assigned.setName("Assigned");
- assigned.setColor("#5d9d41");
+ assigned.setColor("#9900ff");
assigned.setFields(Lists.newArrayList("Assignee"));
states.add(assigned);
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 208330ada3..7896dbebef 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -32,7 +32,6 @@ import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
-import io.onedev.server.web.page.project.issues.issuedetail.changes.IssueChangesPage;
import io.onedev.server.web.page.project.issues.issuedetail.overview.IssueOverviewPage;
import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;
@@ -199,7 +198,6 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/issues", IssueListPage.class));
add(new OnePageMapper("projects/${project}/issues/${issue}/overview", IssueOverviewPage.class));
- add(new OnePageMapper("projects/${project}/issues/${issue}/changes", IssueChangesPage.class));
add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));
add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));
diff --git a/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.html b/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.html
index 692606b80d..248f95f67a 100644
--- a/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.html
@@ -32,9 +32,9 @@
<a wicket:id="detail" class="detail">view detail</a>
</div>
<div wicket:id="content" class="content"></div>
- <div wicket:id="lastEvent" class="last-event">
+ <div wicket:id="lastActivity" class="last-activity">
<a wicket:id="user" class="user"></a>
- <span wicket:id="description"></span>
+ <span wicket:id="action"></span>
<span wicket:id="date"></span>
</div>
</wicket:fragment>
diff --git a/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.java
index ec2e6940e9..5193b34a6f 100644
--- a/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.java
@@ -199,28 +199,28 @@ public abstract class CodeCommentListPanel extends Panel {
}, contentVersionSupport));
- WebMarkupContainer lastEventContainer = new WebMarkupContainer("lastEvent");
- if (comment.getLastEvent() != null) {
- String description = comment.getLastEvent().getType();
- lastEventContainer.add(new Label("description", description));
+ WebMarkupContainer lastActivityContainer = new WebMarkupContainer("lastActivity");
+ if (comment.getLastActivity() != null) {
+ String action = comment.getLastActivity().getAction();
+ lastActivityContainer.add(new Label("action", action));
- userForDisplay = User.getForDisplay(comment.getLastEvent().getUser(),
- comment.getLastEvent().getUserName());
- lastEventContainer.add(new UserLink("user", userForDisplay));
- lastEventContainer.add(new Label("date", DateUtils.formatAge(comment.getLastEvent().getDate())));
+ userForDisplay = User.getForDisplay(comment.getLastActivity().getUser(),
+ comment.getLastActivity().getUserName());
+ lastActivityContainer.add(new UserLink("user", userForDisplay));
+ lastActivityContainer.add(new Label("date", DateUtils.formatAge(comment.getLastActivity().getDate())));
} else {
- lastEventContainer.add(new WebMarkupContainer("description"));
- lastEventContainer.add(new WebMarkupContainer("user"));
- lastEventContainer.add(new WebMarkupContainer("date"));
- lastEventContainer.setVisible(false);
+ lastActivityContainer.add(new WebMarkupContainer("action"));
+ lastActivityContainer.add(new WebMarkupContainer("user"));
+ lastActivityContainer.add(new WebMarkupContainer("date"));
+ lastActivityContainer.setVisible(false);
}
- fragment.add(lastEventContainer);
+ fragment.add(lastActivityContainer);
cellItem.add(fragment);
Date lastUpdateDate;
- if (comment.getLastEvent() != null)
- lastUpdateDate = comment.getLastEvent().getDate();
+ if (comment.getLastActivity() != null)
+ lastUpdateDate = comment.getLastActivity().getDate();
else
lastUpdateDate = comment.getDate();
cellItem.add(AttributeAppender.append("class",
diff --git a/core/src/main/java/io/onedev/server/web/component/comment/code-comment.css b/core/src/main/java/io/onedev/server/web/component/comment/code-comment.css
index 0d7a0606d3..c49c53ad06 100644
--- a/core/src/main/java/io/onedev/server/web/component/comment/code-comment.css
+++ b/core/src/main/java/io/onedev/server/web/component/comment/code-comment.css
@@ -41,11 +41,11 @@
.code-comments td.comment>div>.content {
margin-left: 30px;
}
-.code-comments td.comment>div>.last-event {
+.code-comments td.comment>div>.last-activity {
color: #888;
margin-left: 20px;
}
-.code-comments td.comment>div>.title a, .code-comments td.comment>div>.last-event a {
+.code-comments td.comment>div>.title a, .code-comments td.comment>div>.last-activity a {
color: #444;
}
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.java
index 207c12df33..5c4a23760d 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
@@ -6,6 +6,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
@@ -65,7 +66,6 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.issuedetail.changes.IssueChangesPage;
import io.onedev.server.web.page.project.issues.issuedetail.overview.IssueOverviewPage;
import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;
@@ -118,7 +118,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
String prevTitle = getIssue().getTitle();
getIssue().setTitle(titleInput.getModelObject());
- getIssueEditManager().changeTitle(getIssue(), prevTitle);
+ OneDev.getInstance(IssueChangeManager.class).changeTitle(getIssue(), prevTitle);
Fragment titleViewer = newTitleViewer();
titleEditor.replaceWith(titleViewer);
@@ -233,6 +233,9 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
public void onClick(AjaxRequestTarget target) {
Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueDetailPage.this);
Serializable fieldBean = getIssueFieldManager().readFields(getIssue());
+ String prevState = getIssue().getState();
+ Map<String, PromptedField> prevFields = getIssue().getPromptedFields();
+
Set<String> excludedFields = getIssueFieldManager().getExcludedFields(getIssue().getProject(), transition.getToState());
Form<?> form = new Form<Void>("form") {
@@ -278,7 +281,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
promptedFields.remove(propertyContext.getDisplayName());
}
}
- getIssueManager().save(getIssue(), fieldBean, promptedFields);
+ getIssueChangeManager().changeState(getIssue(), fieldBean, comment, prevState, prevFields, promptedFields);
+
setResponsePage(IssueOverviewPage.class, IssueOverviewPage.paramsOf(getIssue()));
}
@@ -322,7 +326,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
List<Tab> tabs = new ArrayList<>();
tabs.add(new IssueTab("Overview", IssueOverviewPage.class));
- tabs.add(new IssueTab("Change History", IssueChangesPage.class));
add(new Tabbable("issueTabs", tabs).setOutputMarkupId(true));
@@ -383,18 +386,14 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
}
}
- private IssueManager getIssueManager() {
- return OneDev.getInstance(IssueManager.class);
+ private IssueChangeManager getIssueChangeManager() {
+ return OneDev.getInstance(IssueChangeManager.class);
}
private IssueFieldManager getIssueFieldManager() {
return OneDev.getInstance(IssueFieldManager.class);
}
- private IssueChangeManager getIssueEditManager() {
- return OneDev.getInstance(IssueChangeManager.class);
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/IssueChangesPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/IssueChangesPage.html
deleted file mode 100644
index c09694ef7f..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/IssueChangesPage.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<wicket:extend>
- <table class="changes">
- <tr wicket:id="changes">
- <td class="avatar"><a wicket:id="avatar"></a></td>
- <td class="content">
- <div class="head">
- <span wicket:id="user" class="user"></span> changed <span wicket:id="property"></span> <span wicket:id="age"></span>
- </div>
- <div wicket:id="body" class="body"></div>
- </td>
- </tr>
- </table>
-</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/IssueChangesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/IssueChangesPage.java
deleted file mode 100644
index 61a3d748d1..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/IssueChangesPage.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package io.onedev.server.web.page.project.issues.issuedetail.changes;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.google.common.base.Splitter;
-
-import edu.emory.mathcs.backport.java.util.Collections;
-import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.User;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.avatar.AvatarLink;
-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-import io.onedev.server.web.component.link.UserLink;
-import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;
-
-@SuppressWarnings("serial")
-public class IssueChangesPage extends IssueDetailPage {
-
- public IssueChangesPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new ListView<IssueChange>("changes", new LoadableDetachableModel<List<IssueChange>>() {
-
- @Override
- protected List<IssueChange> load() {
- List<IssueChange> changes = new ArrayList<>(getIssue().getChanges());
- Collections.sort(changes, new Comparator<IssueChange>() {
-
- @Override
- public int compare(IssueChange o1, IssueChange o2) {
- return o1.getDate().compareTo(o2.getDate());
- }
-
- });
- return changes;
- }
-
- }) {
-
- @Override
- protected void populateItem(ListItem<IssueChange> item) {
- IssueChange change = item.getModelObject();
- item.add(new AvatarLink("avatar", User.getForDisplay(change.getUser(), change.getUserName())));
-
- item.add(new UserLink("user", User.getForDisplay(change.getUser(), change.getUserName())));
- item.add(new Label("property", change.getProperty()));
- item.add(new Label("age", DateUtils.formatAge(change.getDate())));
-
- List<String> prevLines;
- if (change.getPrevContent() != null)
- prevLines = Splitter.on("\n").splitToList(change.getPrevContent());
- else
- prevLines = new ArrayList<>();
-
- List<String> lines;
- if (change.getContent() != null)
- lines = Splitter.on("\n").splitToList(change.getContent());
- else
- lines = new ArrayList<>();
- item.add(new PlainDiffPanel("body", prevLines, lines));
- }
-
- });
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new IssueChangesResourceReference()));
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/IssueChangesResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/IssueChangesResourceReference.java
deleted file mode 100644
index 80307f4400..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/IssueChangesResourceReference.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.onedev.server.web.page.project.issues.issuedetail.changes;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-@SuppressWarnings("serial")
-public class IssueChangesResourceReference extends BaseDependentCssResourceReference {
-
- public IssueChangesResourceReference() {
- super(IssueChangesResourceReference.class, "issue-changes.css");
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/issue-changes.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/issue-changes.css
deleted file mode 100644
index 4d0e9cee05..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changes/issue-changes.css
+++ /dev/null
@@ -1,24 +0,0 @@
-#issue-detail>.changes>tbody>tr>td {
- border-bottom: 1px solid #EEE;
- padding: 16px 0;
-}
-#issue-detail>.changes>tbody>tr:last-child>td {
- border-bottom: none;
-}
-#issue-detail>.changes>tbody>tr>td.avatar {
- width: 40px;
- padding-left: 16px;
-}
-#issue-detail>.changes>tbody>tr>td.avatar .avatar {
- width: 40px;
- height: 40px;
-}
-#issue-detail>.changes>tbody>tr>td.content {
- padding-left: 20px;
-}
-#issue-detail>.changes>tbody>tr>td.content>.head {
- color: #888;
-}
-#issue-detail>.changes>tbody>tr>td.content>.body {
- margin-top: 8px;
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewPage.java
index 945e92fd3c..2e65299a42 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/IssueOverviewPage.java
@@ -42,6 +42,7 @@ import io.onedev.server.manager.IssueCommentManager;
import io.onedev.server.manager.IssueFieldManager;
import io.onedev.server.manager.IssueManager;
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;
@@ -60,6 +61,7 @@ import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;
+import io.onedev.server.web.page.project.issues.issuedetail.overview.activity.ChangedActivity;
import io.onedev.server.web.page.project.issues.issuedetail.overview.activity.CommentedActivity;
import io.onedev.server.web.page.project.issues.issuedetail.overview.activity.IssueActivity;
import io.onedev.server.web.page.project.issues.issuedetail.overview.activity.IssueCommentDeleted;
@@ -85,6 +87,9 @@ public class IssueOverviewPage extends IssueDetailPage {
for (IssueComment comment: getIssue().getComments())
activities.add(new CommentedActivity(comment));
+ for (IssueChange change: getIssue().getChanges())
+ activities.add(new ChangedActivity(change));
+
activities.sort((o1, o2) -> {
if (o1.getDate().getTime()<o2.getDate().getTime())
return -1;
@@ -235,16 +240,6 @@ public class IssueOverviewPage extends IssueDetailPage {
input.setModelObject("");
target.add(fragment);
-
- @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.appendJavaScript(String.format("localStorage.removeItem('%s');", autosaveKey));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedActivity.java
new file mode 100644
index 0000000000..df25103feb
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedActivity.java
@@ -0,0 +1,47 @@
+package io.onedev.server.web.page.project.issues.issuedetail.overview.activity;
+
+import java.util.Date;
+
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.IssueChangeManager;
+import io.onedev.server.model.IssueChange;
+
+@SuppressWarnings("serial")
+public class ChangedActivity implements IssueActivity {
+
+ private final Long changeId;
+
+ public ChangedActivity(IssueChange change) {
+ changeId = change.getId();
+ }
+
+ @Override
+ public Panel render(String panelId) {
+ return new ChangedPanel(panelId, new LoadableDetachableModel<IssueChange>() {
+
+ @Override
+ protected IssueChange load() {
+ return getChange();
+ }
+
+ });
+ }
+
+ public IssueChange getChange() {
+ return OneDev.getInstance(IssueChangeManager.class).load(changeId);
+ }
+
+ @Override
+ public Date getDate() {
+ return getChange().getDate();
+ }
+
+ @Override
+ public String getAnchor() {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.html
new file mode 100644
index 0000000000..784ba39dc7
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.html
@@ -0,0 +1,8 @@
+<wicket:panel>
+ <div class="change activity">
+ <div class="head">
+ <span wicket:id="user" class="user"></span> changed <span wicket:id="property"></span> <span wicket:id="age"></span>
+ </div>
+ <div wicket:id="body" class="body"></div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.java
new file mode 100644
index 0000000000..9fbc30dfe3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/activity/ChangedPanel.java
@@ -0,0 +1,49 @@
+package io.onedev.server.web.page.project.issues.issuedetail.overview.activity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+
+import com.google.common.base.Splitter;
+
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.User;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
+import io.onedev.server.web.component.link.UserLink;
+
+@SuppressWarnings("serial")
+class ChangedPanel extends GenericPanel<IssueChange> {
+
+ public ChangedPanel(String id, IModel<IssueChange> model) {
+ super(id, model);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ IssueChange change = getModelObject();
+ User userForDisplay = User.getForDisplay(change.getUser(), change.getUserName());
+ add(new UserLink("user", userForDisplay));
+ add(new Label("property", change.getProperty()));
+ add(new Label("age", DateUtils.formatAge(change.getDate())));
+
+ List<String> prevLines;
+ if (change.getPrevContent() != null)
+ prevLines = Splitter.on("\n").splitToList(change.getPrevContent());
+ else
+ prevLines = new ArrayList<>();
+
+ List<String> lines;
+ if (change.getContent() != null)
+ lines = Splitter.on("\n").splitToList(change.getContent());
+ else
+ lines = new ArrayList<>();
+ add(new PlainDiffPanel("body", prevLines, lines));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/issue-overview.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/issue-overview.css
index a5dc089614..3bdc99cd96 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/issue-overview.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/overview/issue-overview.css
@@ -49,6 +49,9 @@
color: #999;
margin-left: 8px;
}
+#issue-detail>.overview>.activities .add-comment {
+ margin-top: 16px;
+}
#issue-detail>.overview>.activities .login-to-comment {
border: 1px solid #EEE;
vertical-align: center;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
index 2729d1d3cf..d2a3b46c0c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
@@ -37,20 +37,23 @@
cause issue working improperly, please
<a wicket:id="reconcile">reconcile</a> existing issues with the change</div>
</wicket:enclosure>
- <div wicket:id="issues" class="issue">
+ <div wicket:id="issues">
<div class="primary">
<div wicket:id="number" class="number"></div>
<div wicket:id="title" class="title"></div>
- <div class="submitter">
- <a wicket:id="submitterName"></a>
- opened
- <span wicket:id="submitDate"></span>
+ <div class="last-activity">
+ <a wicket:id="user"></a>
+ <span wicket:id="action"></span>
+ <span wicket:id="date"></span>
</div>
</div>
<div class="additional">
<div class="state"><div wicket:id="state"></div></div>
<div wicket:id="fields"></div>
- <div title="Votes" class="votes"><i class="fa fa-thumbs-o-up"></i> <span wicket:id="votes" class="votes"></span></div>
+ <div class="votes-and-comments">
+ <span title="Votes"><i class="fa fa-thumbs-o-up"></i> <span wicket:id="votes" class="votes"></span></span>
+ <span title="Comments"><i class="fa fa-comments"></i> <span wicket:id="comments" class="comments"></span></span>
+ </div>
</div>
</div>
<div class="center"><ul wicket:id="issuesPageNav"></ul></div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
index d950825ec9..7866352ba5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.issues.issuelist;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Date;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -669,9 +670,11 @@ public class IssueListPage extends ProjectPage {
link.add(new Label("label", issue.getTitle()));
titleFrag.add(link);
item.add(titleFrag);
-
- item.add(new UserLink("submitterName", User.getForDisplay(issue.getSubmitter(), issue.getSubmitterName())));
- item.add(new Label("submitDate", DateUtils.formatAge(issue.getSubmitDate())));
+
+ item.add(new UserLink("user",
+ User.getForDisplay(issue.getLastActivity().getUser(), issue.getLastActivity().getUserName())));
+ item.add(new Label("action", issue.getLastActivity().getAction()));
+ item.add(new Label("date", DateUtils.formatAge(issue.getLastActivity().getDate())));
item.add(new IssueStateLabel("state", item.getModel()));
@@ -688,7 +691,16 @@ public class IssueListPage extends ProjectPage {
}
item.add(fieldsView);
- item.add(new Label("votes", issue.getVotes()));
+ item.add(new Label("votes", issue.getNumOfVotes()));
+ item.add(new Label("comments", issue.getNumOfComments()));
+
+ Date lastActivityDate;
+ if (issue.getLastActivity() != null)
+ lastActivityDate = issue.getLastActivity().getDate();
+ else
+ lastActivityDate = issue.getSubmitDate();
+ item.add(AttributeAppender.append("class",
+ issue.isVisitedAfter(lastActivityDate)?"issue":"issue new"));
}
};
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java
index 47b2c3d0fc..5f7384a38d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java
@@ -107,7 +107,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
candidates.add(field.getName());
suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
} else if ("orderField".equals(spec.getLabel())) {
- List<String> candidates = Lists.newArrayList(Issue.VOTES, Issue.NUMBER, Issue.SUBMIT_DATE);
+ List<String> candidates = Lists.newArrayList(Issue.VOTES, Issue.COMMENTS, Issue.NUMBER, Issue.SUBMIT_DATE);
for (InputSpec field: project.getIssueWorkflow().getFields()) {
if (field instanceof NumberInput || field instanceof ChoiceInput || field instanceof DateInput)
candidates.add(field.getName());
@@ -173,8 +173,9 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
OneContext.pop();
}
} else if (fieldName.equals(Issue.TITLE) || fieldName.equals(Issue.DESCRIPTION)
- || fieldName.equals(Issue.VOTES) || fieldName.equals(Issue.NUMBER)
- || field instanceof NumberInput || field instanceof TextInput) {
+ || fieldName.equals(Issue.VOTES) || fieldName.equals(Issue.COMMENTS)
+ || fieldName.equals(Issue.NUMBER) || field instanceof NumberInput
+ || field instanceof TextInput) {
return null;
}
} catch (OneException ex) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
index a25fff3973..17d8bfb404 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
@@ -89,11 +89,20 @@
#issue-list .issue .additional .state>div {
font-weight: bold;
}
-#issue-list .issue .additional>.votes {
+#issue-list .issue .additional>.votes-and-comments {
text-align: right;
padding-right: 0;
}
-
+#issue-list .issue .additional>.votes-and-comments>span:first-child {
+ margin-right: 8px;
+}
+#issue-list .issue {
+ border-left: 4px solid white;
+ padding-left: 8px;
+}
+#issue-list .new.issue {
+ border-left-color: #4667EE;
+}
.edit-saved-issue-query .actions {
width: 10%;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
index d8c11d64af..7f61c997ff 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
@@ -63,7 +63,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {
protected void onSubmit() {
super.onSubmit();
StateSpec stateSpec = Preconditions.checkNotNull(getProject().getIssueWorkflow().getState(issue.getState()));
- getIssueManager().save(issue, fieldBean, stateSpec.getFields());
+ getIssueManager().open(issue, fieldBean, stateSpec.getFields());
setResponsePage(IssueOverviewPage.class, IssueOverviewPage.paramsOf(issue));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java
index e2dd21bc1f..1574a88118 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java
@@ -940,8 +940,8 @@ public abstract class RequestDetailPage extends ProjectPage {
@Override
protected String load() {
PullRequest request = getPullRequest();
- if (request.getLastCodeCommentEventDate() != null
- && !request.isCodeCommentsVisitedAfter(request.getLastCodeCommentEventDate())) {
+ if (request.getLastCodeCommentActivityDate() != null
+ && !request.isCodeCommentsVisitedAfter(request.getLastCodeCommentActivityDate())) {
return "new";
} else {
return "";
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html
index 4739ef34e9..5889e4c13d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html
@@ -37,10 +37,10 @@
<span class="fa fa-long-arrow-left"></span>
<a wicket:id="source" class="branch"></a>
</span>
- <span wicket:id="lastEvent">
+ <span wicket:id="lastActivity">
<span class="middot"></span>
<a wicket:id="user"></a>
- <span wicket:id="description"></span>
+ <span wicket:id="action"></span>
<span wicket:id="date"></span>
</span>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java
index 8c48d4c8f0..b9e373a7a8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java
@@ -300,31 +300,31 @@ public class RequestListPage extends ProjectPage {
});
}
- WebMarkupContainer lastEventContainer = new WebMarkupContainer("lastEvent");
- if (request.getLastEvent() != null) {
- String description = request.getLastEvent().getType();
- if (description.startsWith("there are")) {
- lastEventContainer.add(new WebMarkupContainer("user").setVisible(false));
+ WebMarkupContainer lastActivityContainer = new WebMarkupContainer("lastActivity");
+ if (request.getLastActivity() != null) {
+ String action = request.getLastActivity().getAction();
+ if (action.startsWith("there are")) {
+ lastActivityContainer.add(new WebMarkupContainer("user").setVisible(false));
} else {
- userForDisplay = User.getForDisplay(request.getLastEvent().getUser(),
- request.getLastEvent().getUserName());
- lastEventContainer.add(new UserLink("user", userForDisplay));
+ userForDisplay = User.getForDisplay(request.getLastActivity().getUser(),
+ request.getLastActivity().getUserName());
+ lastActivityContainer.add(new UserLink("user", userForDisplay));
}
- lastEventContainer.add(new Label("description", description));
- lastEventContainer.add(new Label("date", DateUtils.formatAge(request.getLastEvent().getDate())));
+ lastActivityContainer.add(new Label("action", action));
+ lastActivityContainer.add(new Label("date", DateUtils.formatAge(request.getLastActivity().getDate())));
} else {
- lastEventContainer.add(new UserLink("user", User.getForDisplay(request.getSubmitter(),
+ lastActivityContainer.add(new UserLink("user", User.getForDisplay(request.getSubmitter(),
request.getSubmitterName())));
- lastEventContainer.add(new Label("description", "submitted"));
- lastEventContainer.add(new Label("date", DateUtils.formatAge(request.getSubmitDate())));
+ lastActivityContainer.add(new Label("action", "submitted"));
+ lastActivityContainer.add(new Label("date", DateUtils.formatAge(request.getSubmitDate())));
}
- fragment.add(lastEventContainer);
+ fragment.add(lastActivityContainer);
cellItem.add(fragment);
Date lastActivityDate;
- if (request.getLastEvent() != null)
- lastActivityDate = request.getLastEvent().getDate();
+ if (request.getLastActivity() != null)
+ lastActivityDate = request.getLastActivity().getDate();
else
lastActivityDate = request.getSubmitDate();
cellItem.add(AttributeAppender.append("class",
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.java
index bc94842450..3703a9e127 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,7 +6,6 @@ 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;
@Singleton
public class IssueEventBroadcaster {
@@ -20,8 +19,7 @@ public class IssueEventBroadcaster {
@Listen
public void on(IssueEvent event) {
- PageKey sourcePageKey = WicketUtils.getPageKey();
- webSocketManager.onObservableChanged(Issue.getWebSocketObservable(event.getIssue().getId()), sourcePageKey);
+ webSocketManager.onObservableChanged(Issue.getWebSocketObservable(event.getIssue().getId()), null);
}
}
\ No newline at end of file