Skip to content

The Unified and Autonomous Development Platform

Back reference in activity stream to markdown referenced issues and pull requests

Robin Shen8a3277394474
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index 557850e9e8..7cca590b11 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -96,7 +96,7 @@ import io.onedev.server.manager.CommitQuerySettingManager;
import io.onedev.server.manager.ConfigurationManager;
import io.onedev.server.manager.DataManager;
import io.onedev.server.manager.TeamManager;
-import io.onedev.server.manager.IssueActionManager;
+import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueCommentManager;
import io.onedev.server.manager.IssueFieldUnaryManager;
import io.onedev.server.manager.BuildInfoManager;
@@ -109,7 +109,7 @@ import io.onedev.server.manager.MarkdownManager;
import io.onedev.server.manager.MembershipManager;
import io.onedev.server.manager.MilestoneManager;
import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.manager.PullRequestActionManager;
+import io.onedev.server.manager.PullRequestChangeManager;
import io.onedev.server.manager.PullRequestBuildManager;
import io.onedev.server.manager.PullRequestCommentManager;
import io.onedev.server.manager.PullRequestManager;
@@ -139,8 +139,9 @@ import io.onedev.server.manager.impl.DefaultCommitNotificationManager;
import io.onedev.server.manager.impl.DefaultCommitQuerySettingManager;
import io.onedev.server.manager.impl.DefaultConfigurationManager;
import io.onedev.server.manager.impl.DefaultDataManager;
+import io.onedev.server.manager.impl.DefaultEntityReferenceManager;
import io.onedev.server.manager.impl.DefaultTeamManager;
-import io.onedev.server.manager.impl.DefaultIssueActionManager;
+import io.onedev.server.manager.impl.DefaultIssueChangeManager;
import io.onedev.server.manager.impl.DefaultIssueCommentManager;
import io.onedev.server.manager.impl.DefaultIssueFieldUnaryManager;
import io.onedev.server.manager.impl.DefaultBuildInfoManager;
@@ -154,7 +155,7 @@ import io.onedev.server.manager.impl.DefaultMarkdownManager;
import io.onedev.server.manager.impl.DefaultMembershipManager;
import io.onedev.server.manager.impl.DefaultMilestoneManager;
import io.onedev.server.manager.impl.DefaultProjectManager;
-import io.onedev.server.manager.impl.DefaultPullRequestActionManager;
+import io.onedev.server.manager.impl.DefaultPullRequestChangeManager;
import io.onedev.server.manager.impl.DefaultPullRequestBuildManager;
import io.onedev.server.manager.impl.DefaultPullRequestCommentManager;
import io.onedev.server.manager.impl.DefaultPullRequestManager;
@@ -313,7 +314,7 @@ public class CoreModule extends AbstractPluginModule {
bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);
bind(TeamManager.class).to(DefaultTeamManager.class);
bind(MembershipManager.class).to(DefaultMembershipManager.class);
- bind(PullRequestActionManager.class).to(DefaultPullRequestActionManager.class);
+ bind(PullRequestChangeManager.class).to(DefaultPullRequestChangeManager.class);
bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);
bind(AttachmentManager.class).to(DefaultAttachmentManager.class);
bind(CodeCommentRelationInfoManager.class).to(DefaultCodeCommentRelationInfoManager.class);
@@ -323,10 +324,11 @@ public class CoreModule extends AbstractPluginModule {
bind(DefaultPullRequestNotificationManager.class);
bind(DefaultCommitNotificationManager.class);
bind(DefaultIssueNotificationManager.class);
+ bind(DefaultEntityReferenceManager.class);
bind(DefaultCodeCommentNotificationManager.class);
bind(CodeCommentManager.class).to(DefaultCodeCommentManager.class);
bind(IssueWatchManager.class).to(DefaultIssueWatchManager.class);
- bind(IssueActionManager.class).to(DefaultIssueActionManager.class);
+ bind(IssueChangeManager.class).to(DefaultIssueChangeManager.class);
bind(IssueVoteManager.class).to(DefaultIssueVoteManager.class);
bind(CacheManager.class).to(DefaultCacheManager.class);
bind(MilestoneManager.class).to(DefaultMilestoneManager.class);
diff --git a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentAdded.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentAdded.java
deleted file mode 100644
index a94964db1a..0000000000
--- a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentAdded.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.onedev.server.event.codecomment;
-
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable(name="created")
-public class CodeCommentAdded extends CodeCommentEvent {
-
- public CodeCommentAdded(CodeComment comment, PullRequest request) {
- super(comment.getUser(), comment.getDate(), comment, request);
- }
-
- @Override
- public String getMarkdown() {
- return getComment().getContent();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
new file mode 100644
index 0000000000..34882c358d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
@@ -0,0 +1,18 @@
+package io.onedev.server.event.codecomment;
+
+import io.onedev.server.event.MarkdownAware;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.PullRequest;
+
+public class CodeCommentCreated extends CodeCommentEvent implements MarkdownAware {
+
+ public CodeCommentCreated(CodeComment comment, PullRequest request) {
+ super(comment.getUser(), comment.getCreateDate(), comment, request);
+ }
+
+ @Override
+ public String getMarkdown() {
+ return getComment().getContent();
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentDeleted.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentDeleted.java
new file mode 100644
index 0000000000..9e4c2e9549
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentDeleted.java
@@ -0,0 +1,14 @@
+package io.onedev.server.event.codecomment;
+
+import java.util.Date;
+
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.User;
+
+public class CodeCommentDeleted extends CodeCommentEvent {
+
+ public CodeCommentDeleted(User user, CodeComment comment) {
+ super(user, new Date(), comment, null);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java
index 36b2057b31..8c8cee8ce2 100644
--- a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java
+++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java
@@ -4,13 +4,12 @@ import java.util.Date;
import javax.annotation.Nullable;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-public abstract class CodeCommentEvent extends ProjectEvent implements MarkdownAware {
+public abstract class CodeCommentEvent extends ProjectEvent {
private final CodeComment comment;
diff --git a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
index 7d5100fa01..5d20705913 100644
--- a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
+++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
@@ -1,11 +1,10 @@
package io.onedev.server.event.codecomment;
+import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.web.editable.annotation.Editable;
-@Editable(name="replied")
-public class CodeCommentReplied extends CodeCommentEvent {
+public class CodeCommentReplied extends CodeCommentEvent implements MarkdownAware {
private final CodeCommentReply reply;
diff --git a/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
new file mode 100644
index 0000000000..4b939f76d5
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
@@ -0,0 +1,20 @@
+package io.onedev.server.event.codecomment;
+
+import java.util.Date;
+
+import io.onedev.server.event.MarkdownAware;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.User;
+
+public class CodeCommentUpdated extends CodeCommentEvent implements MarkdownAware {
+
+ public CodeCommentUpdated(User user, CodeComment comment) {
+ super(user, new Date(), comment, null);
+ }
+
+ @Override
+ public String getMarkdown() {
+ return getComment().getContent();
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java b/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java
deleted file mode 100644
index a9d361e3ca..0000000000
--- a/core/src/main/java/io/onedev/server/event/issue/IssueActionEvent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.onedev.server.event.issue;
-
-import io.onedev.server.event.MarkdownAware;
-import io.onedev.server.model.IssueAction;
-
-public class IssueActionEvent extends IssueEvent implements MarkdownAware {
-
- private final IssueAction action;
-
- public IssueActionEvent(IssueAction action) {
- super(action.getUser(), action.getDate(), action.getIssue());
- this.action = action;
- }
-
- public IssueAction getAction() {
- return action;
- }
-
- @Override
- public String getMarkdown() {
- if (action.getData().getCommentSupport() != null)
- return action.getData().getCommentSupport().getComment();
- else
- return null;
- }
-
- @Override
- public boolean affectsBoards() {
- return true;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java b/core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java
new file mode 100644
index 0000000000..7f75c398e4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java
@@ -0,0 +1,32 @@
+package io.onedev.server.event.issue;
+
+import io.onedev.server.event.MarkdownAware;
+import io.onedev.server.model.IssueChange;
+
+public class IssueChangeEvent extends IssueEvent implements MarkdownAware {
+
+ private final IssueChange change;
+
+ public IssueChangeEvent(IssueChange change) {
+ super(change.getUser(), change.getDate(), change.getIssue());
+ this.change = change;
+ }
+
+ public IssueChange getChange() {
+ return change;
+ }
+
+ @Override
+ public String getMarkdown() {
+ if (change.getData().getCommentSupport() != null)
+ return change.getData().getCommentSupport().getComment();
+ else
+ return null;
+ }
+
+ @Override
+ public boolean affectsBoards() {
+ return true;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestActionEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestActionEvent.java
deleted file mode 100644
index 75cf6d6c85..0000000000
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestActionEvent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.onedev.server.event.pullrequest;
-
-import io.onedev.server.event.MarkdownAware;
-import io.onedev.server.model.PullRequestAction;
-
-public class PullRequestActionEvent extends PullRequestEvent implements MarkdownAware {
-
- private final PullRequestAction action;
-
- public PullRequestActionEvent(PullRequestAction action) {
- super(action.getUser(), action.getDate(), action.getRequest());
- this.action = action;
- }
-
- public PullRequestAction getAction() {
- return action;
- }
-
- @Override
- public String getMarkdown() {
- if (action.getData().getCommentSupport() != null)
- return action.getData().getCommentSupport().getComment();
- else
- return null;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java
new file mode 100644
index 0000000000..d5c5c99ba7
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java
@@ -0,0 +1,27 @@
+package io.onedev.server.event.pullrequest;
+
+import io.onedev.server.event.MarkdownAware;
+import io.onedev.server.model.PullRequestChange;
+
+public class PullRequestChangeEvent extends PullRequestEvent implements MarkdownAware {
+
+ private final PullRequestChange change;
+
+ public PullRequestChangeEvent(PullRequestChange change) {
+ super(change.getUser(), change.getDate(), change.getRequest());
+ this.change = change;
+ }
+
+ public PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ public String getMarkdown() {
+ if (change.getData().getCommentSupport() != null)
+ return change.getData().getCommentSupport().getComment();
+ else
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentAdded.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentAdded.java
deleted file mode 100644
index f58665c2dc..0000000000
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentAdded.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.onedev.server.event.pullrequest;
-
-import io.onedev.server.event.MarkdownAware;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.PullRequest;
-
-public class PullRequestCodeCommentAdded extends PullRequestCodeCommentEvent implements MarkdownAware {
-
- public PullRequestCodeCommentAdded(PullRequest request, CodeComment comment, boolean derived) {
- super(comment.getUser(), comment.getDate(), request, comment, derived);
- }
-
- @Override
- public String getMarkdown() {
- return getComment().getContent();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java
new file mode 100644
index 0000000000..dea58d134e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java
@@ -0,0 +1,18 @@
+package io.onedev.server.event.pullrequest;
+
+import io.onedev.server.event.MarkdownAware;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.PullRequest;
+
+public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent implements MarkdownAware {
+
+ public PullRequestCodeCommentCreated(PullRequest request, CodeComment comment, boolean derived) {
+ super(comment.getUser(), comment.getCreateDate(), request, comment, derived);
+ }
+
+ @Override
+ public String getMarkdown() {
+ return getComment().getContent();
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentAdded.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java
similarity index 73%
rename from core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentAdded.java
rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java
index a07bbd625f..c8cd9ce7df 100644
--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentAdded.java
+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java
@@ -3,11 +3,11 @@ package io.onedev.server.event.pullrequest;
import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.PullRequestComment;
-public class PullRequestCommentAdded extends PullRequestEvent implements MarkdownAware {
+public class PullRequestCommentCreated extends PullRequestEvent implements MarkdownAware {
private final PullRequestComment comment;
- public PullRequestCommentAdded(PullRequestComment comment) {
+ public PullRequestCommentCreated(PullRequestComment comment) {
super(comment.getUser(), comment.getDate(), comment.getRequest());
this.comment = comment;
}
diff --git a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
index a96d6f64fd..796686a265 100644
--- a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
+++ b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
@@ -29,11 +29,11 @@ import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.model.User;
import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.TagProtection;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.server.util.PullRequestConstants;
import io.onedev.utils.StringUtils;
import io.onedev.utils.license.LicenseDetail;
diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java
index 263b0c94e4..0d3bc18e5b 100644
--- a/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java
@@ -27,11 +27,14 @@ public interface CodeCommentManager extends EntityManager<CodeComment> {
List<CodeComment> queryAfter(Project project, @Nullable Long afterCommentId, int count);
- void save(CodeComment comment, @Nullable PullRequest request);
+ void create(CodeComment comment, @Nullable PullRequest request);
List<CodeComment> query(Project project, @Nullable PullRequest request, User user,
EntityQuery<CodeComment> commentQuery, int firstResult, int maxResults);
int count(Project project, @Nullable PullRequest request, User user, EntityCriteria<CodeComment> commentCriteria);
+ void delete(User user, CodeComment comment);
+
+ void update(User user, CodeComment comment);
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/manager/IssueActionManager.java b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/manager/IssueActionManager.java
rename to core/src/main/java/io/onedev/server/manager/IssueChangeManager.java
index f4517fd9c6..cce69779b0 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueActionManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java
@@ -8,15 +8,17 @@ import javax.annotation.Nullable;
import com.google.common.base.Optional;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
-public interface IssueActionManager extends EntityManager<IssueAction> {
+public interface IssueChangeManager extends EntityManager<IssueChange> {
void changeTitle(Issue issue, String title, @Nullable User user);
+ void changeDescription(Issue issue, @Nullable String description, @Nullable User user);
+
void changeMilestone(Issue issue, Milestone milestone, @Nullable User user);
void changeFields(Issue issue, Map<String, Object> fieldValues, @Nullable User user);
diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestActionManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestChangeManager.java
similarity index 65%
rename from core/src/main/java/io/onedev/server/manager/PullRequestActionManager.java
rename to core/src/main/java/io/onedev/server/manager/PullRequestChangeManager.java
index 0821b372b1..0d9d04b7e0 100644
--- a/core/src/main/java/io/onedev/server/manager/PullRequestActionManager.java
+++ b/core/src/main/java/io/onedev/server/manager/PullRequestChangeManager.java
@@ -3,15 +3,17 @@ package io.onedev.server.manager;
import javax.annotation.Nullable;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestAction;
+import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.persistence.dao.EntityManager;
-public interface PullRequestActionManager extends EntityManager<PullRequestAction> {
+public interface PullRequestChangeManager extends EntityManager<PullRequestChange> {
void changeMergeStrategy(PullRequest request, MergeStrategy mergeStrategy, @Nullable User user);
void changeTitle(PullRequest request, String title, @Nullable User user);
+ void changeDescription(PullRequest request, @Nullable String description, @Nullable User user);
+
}
diff --git a/core/src/main/java/io/onedev/server/manager/UrlManager.java b/core/src/main/java/io/onedev/server/manager/UrlManager.java
index 021716a912..ce3ef83e71 100644
--- a/core/src/main/java/io/onedev/server/manager/UrlManager.java
+++ b/core/src/main/java/io/onedev/server/manager/UrlManager.java
@@ -7,12 +7,12 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.model.PullRequestAction;
+import io.onedev.server.model.PullRequestChange;
public interface UrlManager {
@@ -24,13 +24,13 @@ public interface UrlManager {
String urlFor(PullRequestComment comment);
- String urlFor(PullRequestAction action);
+ String urlFor(PullRequestChange change);
String urlFor(Issue issue);
String urlFor(IssueComment comment);
- String urlFor(IssueAction change);
+ String urlFor(IssueChange change);
String urlFor(CodeComment comment, @Nullable PullRequest request);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
index 326d0250e4..399112f5ee 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java
@@ -35,7 +35,6 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Configuration;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -47,6 +46,7 @@ import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.search.entity.build.BuildQueryBuildContext;
+import io.onedev.server.util.BuildConstants;
import io.onedev.utils.schedule.SchedulableTask;
import io.onedev.utils.schedule.TaskScheduler;
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
index 9d95d75b6d..78b81e6b55 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
@@ -38,8 +38,10 @@ import com.google.common.collect.Lists;
import io.onedev.launcher.loader.Listen;
import io.onedev.launcher.loader.ListenerRegistry;
-import io.onedev.server.event.codecomment.CodeCommentAdded;
+import io.onedev.server.event.codecomment.CodeCommentCreated;
+import io.onedev.server.event.codecomment.CodeCommentDeleted;
import io.onedev.server.event.codecomment.CodeCommentEvent;
+import io.onedev.server.event.codecomment.CodeCommentUpdated;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.RevListCommand;
import io.onedev.server.manager.CodeCommentManager;
@@ -50,7 +52,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.TextRange;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -62,6 +63,7 @@ import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryBuildContext;
+import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
@@ -85,14 +87,11 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
@Transactional
@Override
- public void save(CodeComment comment, PullRequest request) {
- if (comment.isNew()) {
- dao.persist(comment);
- CodeCommentAdded event = new CodeCommentAdded(comment, request);
- listenerRegistry.post(event);
- } else {
- dao.persist(comment);
- }
+ public void create(CodeComment comment, PullRequest request) {
+ Preconditions.checkArgument(comment.isNew());
+ save(comment);
+ CodeCommentCreated event = new CodeCommentCreated(comment, request);
+ listenerRegistry.post(event);
}
@Transactional
@@ -108,7 +107,8 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
@Transactional
@Listen
public void on(CodeCommentEvent event) {
- event.getComment().setLastActivity(event);
+ if (!(event instanceof CodeCommentDeleted))
+ event.getComment().setUpdateDate(event.getDate());
}
@Sessional
@@ -304,5 +304,20 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
criteriaQuery.select(builder.countDistinct(root));
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
}
+
+ @Transactional
+ @Override
+ public void delete(User user, CodeComment comment) {
+ delete(comment);
+ listenerRegistry.post(new CodeCommentDeleted(user, comment));
+ }
+
+ @Transactional
+ @Override
+ public void update(User user, CodeComment comment) {
+ Preconditions.checkArgument(!comment.isNew());
+ save(comment);
+ listenerRegistry.post(new CodeCommentUpdated(user, comment));
+ }
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.java
index 74b131fbc4..176233ca35 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.java
@@ -8,7 +8,8 @@ import javax.inject.Singleton;
import io.onedev.launcher.loader.Listen;
import io.onedev.server.event.MarkdownAware;
-import io.onedev.server.event.codecomment.CodeCommentAdded;
+import io.onedev.server.event.codecomment.CodeCommentCreated;
+import io.onedev.server.event.codecomment.CodeCommentDeleted;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.event.codecomment.CodeCommentReplied;
import io.onedev.server.manager.MailManager;
@@ -37,15 +38,15 @@ public class DefaultCodeCommentNotificationManager {
@Transactional
@Listen
public void on(CodeCommentEvent event) {
- if (event.getRequest() == null) {
+ if (event.getRequest() == null && !(event instanceof CodeCommentDeleted)) {
MarkdownAware markdownAware = (MarkdownAware) event;
String markdown = markdownAware.getMarkdown();
String rendered = markdownManager.render(markdown);
Collection<User> mentionUsers = new MentionParser().parseMentions(rendered);
if (!mentionUsers.isEmpty()) {
String url;
- if (event instanceof CodeCommentAdded)
- url = urlManager.urlFor(((CodeCommentAdded)event).getComment(), null);
+ if (event instanceof CodeCommentCreated)
+ url = urlManager.urlFor(((CodeCommentCreated)event).getComment(), null);
else
url = urlManager.urlFor(((CodeCommentReplied)event).getReply(), null);
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 3f1f5e8800..c1f94c835a 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
@@ -7,9 +7,9 @@ import org.hibernate.criterion.Restrictions;
import io.onedev.launcher.loader.Listen;
import io.onedev.launcher.loader.ListenerRegistry;
-import io.onedev.server.event.codecomment.CodeCommentAdded;
+import io.onedev.server.event.codecomment.CodeCommentCreated;
import io.onedev.server.event.codecomment.CodeCommentReplied;
-import io.onedev.server.event.pullrequest.PullRequestCodeCommentAdded;
+import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;
import io.onedev.server.manager.CodeCommentRelationManager;
import io.onedev.server.model.CodeComment;
@@ -46,10 +46,9 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Cod
request.setCommentCount(request.getCommentCount() + relation.getComment().getReplyCount() + 1);
super.save(relation);
CodeComment comment = relation.getComment();
- if (request.getLastActivity() == null || comment.getDate().after(request.getLastActivity().getDate())) {
- PullRequestCodeCommentAdded event = new PullRequestCodeCommentAdded(request, comment, derived);
+ if (comment.getCreateDate().after(request.getUpdateDate())) {
+ PullRequestCodeCommentCreated event = new PullRequestCodeCommentCreated(request, comment, derived);
listenerRegistry.post(event);
- request.setLastActivity(event);
}
}
@@ -69,7 +68,7 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Cod
@Listen
@Transactional
- public void on(CodeCommentAdded event) {
+ public void on(CodeCommentCreated event) {
if (event.getRequest() != null) {
CodeCommentRelation relation = new CodeCommentRelation();
relation.setComment(event.getComment());
@@ -85,7 +84,6 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Cod
PullRequestCodeCommentReplied pullRequestCodeCommentReplied = new PullRequestCodeCommentReplied(
relation.getRequest(), event.getReply(), !relation.getRequest().equals(event.getRequest()));
listenerRegistry.post(pullRequestCodeCommentReplied);
- relation.getRequest().setLastActivity(pullRequestCodeCommentReplied);
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultEntityReferenceManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultEntityReferenceManager.java
new file mode 100644
index 0000000000..de5ea06492
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultEntityReferenceManager.java
@@ -0,0 +1,274 @@
+package io.onedev.server.manager.impl;
+
+import java.util.Date;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+
+import io.onedev.launcher.loader.Listen;
+import io.onedev.server.event.codecomment.CodeCommentCreated;
+import io.onedev.server.event.codecomment.CodeCommentUpdated;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.issue.IssueChangeEvent;
+import io.onedev.server.event.issue.IssueOpened;
+import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
+import io.onedev.server.event.pullrequest.PullRequestOpened;
+import io.onedev.server.manager.IssueChangeManager;
+import io.onedev.server.manager.MarkdownManager;
+import io.onedev.server.manager.PullRequestChangeManager;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.util.markdown.IssueParser;
+import io.onedev.server.util.markdown.PullRequestParser;
+
+@Singleton
+public class DefaultEntityReferenceManager {
+
+ private final IssueChangeManager issueChangeManager;
+
+ private final PullRequestChangeManager pullRequestChangeManager;
+
+ private final MarkdownManager markdownManager;
+
+ @Inject
+ public DefaultEntityReferenceManager(IssueChangeManager issueChangeManager,
+ PullRequestChangeManager pullRequestChangeManager, MarkdownManager markdownManager) {
+ this.issueChangeManager = issueChangeManager;
+ this.pullRequestChangeManager = pullRequestChangeManager;
+ this.markdownManager = markdownManager;
+ }
+
+ private void addReferenceChange(Issue issue, String markdown) {
+ if (markdown != null) {
+ Document document = Jsoup.parseBodyFragment(markdownManager.render(markdown));
+ for (Issue referencedIssue: new IssueParser().parseReferences(issue.getProject(), document)) {
+ if (!referencedIssue.equals(issue)) {
+ boolean found = false;
+ for (IssueChange change: referencedIssue.getChanges()) {
+ if (change.getData() instanceof io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData) {
+ io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData referencedFromIssueData =
+ (io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData) change.getData();
+ if (referencedFromIssueData.getIssueId().equals(issue.getId())) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found) {
+ io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData referencedFromIssueData =
+ new io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData(issue);
+ IssueChange change = new IssueChange();
+ change.setData(referencedFromIssueData);
+ change.setDate(new Date());
+ change.setIssue(referencedIssue);
+ referencedIssue.getChanges().add(change);
+ issueChangeManager.save(change);
+ }
+ }
+ }
+ for (PullRequest referencedRequest: new PullRequestParser().parseReferences(issue.getProject(), document)) {
+ boolean found = false;
+ for (PullRequestChange change: referencedRequest.getChanges()) {
+ if (change.getData() instanceof io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData) {
+ io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData referencedFromIssueData =
+ (io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData) change.getData();
+ if (referencedFromIssueData.getIssueId().equals(issue.getId())) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found) {
+ io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData referencedFromIssueData =
+ new io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData(issue);
+ PullRequestChange change = new PullRequestChange();
+ change.setData(referencedFromIssueData);
+ change.setDate(new Date());
+ change.setRequest(referencedRequest);
+ referencedRequest.getChanges().add(change);
+ pullRequestChangeManager.save(change);
+ }
+ }
+ }
+ }
+
+ private void addReferenceChange(PullRequest request, String markdown) {
+ if (markdown != null) {
+ Document document = Jsoup.parseBodyFragment(markdownManager.render(markdown));
+ for (Issue referencedIssue: new IssueParser().parseReferences(request.getTargetProject(), document)) {
+ boolean found = false;
+ for (IssueChange change: referencedIssue.getChanges()) {
+ if (change.getData() instanceof io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData) {
+ io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData referencedFromPullRequestData =
+ (io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData) change.getData();
+ if (referencedFromPullRequestData.getRequestId().equals(request.getId())) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found) {
+ io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData referencedFromPullRequestData =
+ new io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData(request);
+ IssueChange change = new IssueChange();
+ change.setData(referencedFromPullRequestData);
+ change.setDate(new Date());
+ change.setIssue(referencedIssue);
+ referencedIssue.getChanges().add(change);
+ issueChangeManager.save(change);
+ }
+ }
+ for (PullRequest referencedRequest: new PullRequestParser().parseReferences(request.getTargetProject(), document)) {
+ if (!referencedRequest.equals(request)) {
+ boolean found = false;
+ for (PullRequestChange change: referencedRequest.getChanges()) {
+ if (change.getData() instanceof io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData) {
+ io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData referencedFromPullRequestData =
+ (io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData) change.getData();
+ if (referencedFromPullRequestData.getRequestId().equals(request.getId())) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found) {
+ io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData referencedFromPullRequestData =
+ new io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData(request);
+ PullRequestChange change = new PullRequestChange();
+ change.setData(referencedFromPullRequestData);
+ change.setDate(new Date());
+ change.setRequest(referencedRequest);
+ referencedRequest.getChanges().add(change);
+ pullRequestChangeManager.save(change);
+ }
+ }
+ }
+ }
+ }
+
+ private void addReferenceChange(CodeComment comment, String markdown) {
+ if (markdown != null) {
+ Document document = Jsoup.parseBodyFragment(markdownManager.render(markdown));
+ for (Issue referencedIssue: new IssueParser().parseReferences(comment.getProject(), document)) {
+ boolean found = false;
+ for (IssueChange change: referencedIssue.getChanges()) {
+ if (change.getData() instanceof io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData) {
+ io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData referencedFromCodeCommentData =
+ (io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData) change.getData();
+ if (referencedFromCodeCommentData.getCommentId().equals(comment.getId())) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found) {
+ io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData referencedFromCodeCommentData =
+ new io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData(comment);
+ IssueChange change = new IssueChange();
+ change.setData(referencedFromCodeCommentData);
+ change.setDate(new Date());
+ change.setIssue(referencedIssue);
+ referencedIssue.getChanges().add(change);
+ issueChangeManager.save(change);
+ }
+ }
+ for (PullRequest referencedRequest: new PullRequestParser().parseReferences(comment.getProject(), document)) {
+ boolean found = false;
+ for (PullRequestChange change: referencedRequest.getChanges()) {
+ if (change.getData() instanceof io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData) {
+ io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData =
+ (io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData) change.getData();
+ if (referencedFromCodeCommentData.getCommentId().equals(comment.getId())) {
+ found = true;
+ break;
+ }
+ }
+ }
+ if (!found) {
+ io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData =
+ new io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData(comment);
+ PullRequestChange change = new PullRequestChange();
+ change.setData(referencedFromCodeCommentData);
+ change.setDate(new Date());
+ change.setRequest(referencedRequest);
+ referencedRequest.getChanges().add(change);
+ pullRequestChangeManager.save(change);
+ }
+ }
+ }
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.getEntity() instanceof IssueComment) {
+ IssueComment comment = (IssueComment) event.getEntity();
+ addReferenceChange(comment.getIssue(), comment.getContent());
+ } else if (event.getEntity() instanceof IssueChange) {
+ IssueChange change = (IssueChange) event.getEntity();
+ if (change.getData().getCommentSupport() != null)
+ addReferenceChange(change.getIssue(), change.getData().getCommentSupport().getComment());
+ } else if (event.getEntity() instanceof PullRequestComment) {
+ PullRequestComment comment = (PullRequestComment) event.getEntity();
+ addReferenceChange(comment.getRequest(), comment.getContent());
+ } else if (event.getEntity() instanceof PullRequestChange) {
+ PullRequestChange change = (PullRequestChange) event.getEntity();
+ if (change.getData().getCommentSupport() != null)
+ addReferenceChange(change.getRequest(), change.getData().getCommentSupport().getComment());
+ } else if (event.getEntity() instanceof CodeCommentReply) {
+ CodeCommentReply reply = (CodeCommentReply) event.getEntity();
+ addReferenceChange(reply.getComment(), reply.getContent());
+ }
+ }
+
+ @Transactional
+ @Listen
+ public void on(PullRequestOpened event) {
+ addReferenceChange(event.getRequest(), event.getRequest().getDescription());
+ }
+
+ @Transactional
+ @Listen
+ public void on(PullRequestChangeEvent event) {
+ if (event.getChange().getData() instanceof PullRequestDescriptionChangeData)
+ addReferenceChange(event.getRequest(), event.getRequest().getDescription());
+ }
+
+ @Transactional
+ @Listen
+ public void on(IssueOpened event) {
+ addReferenceChange(event.getIssue(), event.getIssue().getDescription());
+ }
+
+ @Transactional
+ @Listen
+ public void on(IssueChangeEvent event) {
+ if (event.getChange().getData() instanceof IssueDescriptionChangeData)
+ addReferenceChange(event.getIssue(), event.getIssue().getDescription());
+ }
+
+ @Transactional
+ @Listen
+ public void on(CodeCommentCreated event) {
+ addReferenceChange(event.getComment(), event.getComment().getContent());
+ }
+
+ @Transactional
+ @Listen
+ public void on(CodeCommentUpdated event) {
+ addReferenceChange(event.getComment(), event.getComment().getContent());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
similarity index 68%
rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.java
rename to core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
index 6461e605cf..e1a722379c 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
@@ -19,27 +19,26 @@ import com.google.common.base.Optional;
import io.onedev.launcher.loader.Listen;
import io.onedev.launcher.loader.ListenerRegistry;
import io.onedev.server.event.build.BuildEvent;
-import io.onedev.server.event.issue.IssueActionEvent;
+import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueCommitted;
-import io.onedev.server.event.pullrequest.PullRequestActionEvent;
+import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.manager.BuildManager;
-import io.onedev.server.manager.IssueActionManager;
+import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueFieldUnaryManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.LastActivity;
-import io.onedev.server.model.support.issue.IssueField;
-import io.onedev.server.model.support.issue.changedata.BatchUpdateData;
-import io.onedev.server.model.support.issue.changedata.FieldChangeData;
-import io.onedev.server.model.support.issue.changedata.MilestoneChangeData;
-import io.onedev.server.model.support.issue.changedata.StateChangeData;
-import io.onedev.server.model.support.issue.changedata.TitleChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;
+import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueFieldChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;
import io.onedev.server.model.support.issue.workflow.TransitionSpec;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.BuildSuccessfulTrigger;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.CommitTrigger;
@@ -47,17 +46,17 @@ import io.onedev.server.model.support.issue.workflow.transitiontrigger.DiscardPu
import io.onedev.server.model.support.issue.workflow.transitiontrigger.MergePullRequest;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.OpenPullRequest;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.PullRequestTrigger;
-import io.onedev.server.model.support.pullrequest.actiondata.DiscardedData;
-import io.onedev.server.model.support.pullrequest.actiondata.MergedData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
import io.onedev.server.persistence.UnitOfWork;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.IssueField;
@Singleton
-public class DefaultIssueActionManager extends AbstractEntityManager<IssueAction>
- implements IssueActionManager {
+public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange>
+ implements IssueChangeManager {
private final IssueManager issueManager;
@@ -72,7 +71,7 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueAction
private final BuildManager buildManager;
@Inject
- public DefaultIssueActionManager(Dao dao, IssueManager issueManager, UnitOfWork unitOfWork,
+ public DefaultIssueChangeManager(Dao dao, IssueManager issueManager, UnitOfWork unitOfWork,
IssueFieldUnaryManager issueFieldUnaryManager, ListenerRegistry listenerRegistry,
ExecutorService executorService, BuildManager buildManager) {
super(dao);
@@ -84,27 +83,42 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueAction
this.buildManager = buildManager;
}
+ @Transactional
+ @Override
+ public void save(IssueChange change) {
+ dao.persist(change);
+ listenerRegistry.post(new IssueChangeEvent(change));
+ }
+
@Transactional
@Override
public void changeTitle(Issue issue, String title, @Nullable User user) {
String prevTitle = issue.getTitle();
if (!title.equals(prevTitle)) {
issue.setTitle(title);
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDescription("changed title");
- lastActivity.setDate(new Date());
- lastActivity.setUser(user);
- issue.setLastActivity(lastActivity);
- issueManager.save(issue);
- IssueAction change = new IssueAction();
+ IssueChange change = new IssueChange();
change.setIssue(issue);
change.setDate(new Date());
- change.setUser(SecurityUtils.getUser());
- change.setData(new TitleChangeData(prevTitle, issue.getTitle()));
+ change.setUser(user);
+ change.setData(new IssueTitleChangeData(prevTitle, issue.getTitle()));
save(change);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void changeDescription(Issue issue, @Nullable String description, @Nullable User user) {
+ String prevDescription = issue.getDescription();
+ if (!Objects.equal(description, prevDescription)) {
+ issue.setDescription(description);
- listenerRegistry.post(new IssueActionEvent(change));
+ IssueChange change = new IssueChange();
+ change.setIssue(issue);
+ change.setDate(new Date());
+ change.setUser(user);
+ change.setData(new IssueDescriptionChangeData(prevDescription, issue.getDescription()));
+ save(change);
}
}
@@ -114,21 +128,13 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueAction
Milestone prevMilestone = issue.getMilestone();
if (!Objects.equal(prevMilestone, milestone)) {
issue.setMilestone(milestone);
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDescription("changed milestone");
- lastActivity.setDate(new Date());
- lastActivity.setUser(SecurityUtils.getUser());
- issue.setLastActivity(lastActivity);
- issueManager.save(issue);
- IssueAction change = new IssueAction();
+ IssueChange change = new IssueChange();
change.setIssue(issue);
change.setDate(new Date());
change.setUser(user);
- change.setData(new MilestoneChangeData(prevMilestone, issue.getMilestone()));
+ change.setData(new IssueMilestoneChangeData(prevMilestone, issue.getMilestone()));
save(change);
-
- listenerRegistry.post(new IssueActionEvent(change));
}
}
@@ -140,21 +146,12 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueAction
if (!prevFields.equals(issue.getFields())) {
issueFieldUnaryManager.saveFields(issue);
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDescription("changed fields");
- lastActivity.setDate(new Date());
- lastActivity.setUser(user);
- issue.setLastActivity(lastActivity);
- issueManager.save(issue);
-
- IssueAction change = new IssueAction();
+ IssueChange change = new IssueChange();
change.setIssue(issue);
change.setDate(new Date());
- change.setUser(SecurityUtils.getUser());
- change.setData(new FieldChangeData(prevFields, issue.getFields()));
+ change.setUser(user);
+ change.setData(new IssueFieldChangeData(prevFields, issue.getFields()));
save(change);
-
- listenerRegistry.post(new IssueActionEvent(change));
}
}
@@ -169,23 +166,14 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueAction
issue.setFieldValues(fieldValues);
issueFieldUnaryManager.saveFields(issue);
-
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDescription("changed state to \"" + issue.getState() + "\"");
- lastActivity.setDate(new Date());
- lastActivity.setUser(user);
- issue.setLastActivity(lastActivity);
- issueManager.save(issue);
- IssueAction change = new IssueAction();
+ IssueChange change = new IssueChange();
change.setIssue(issue);
change.setDate(new Date());
- change.setUser(SecurityUtils.getUser());
- change.setData(new StateChangeData(prevState, issue.getState(), prevFields, issue.getFields(), comment));
+ change.setUser(user);
+ change.setData(new IssueStateChangeData(prevState, issue.getState(), prevFields, issue.getFields(), comment));
save(change);
-
- listenerRegistry.post(new IssueActionEvent(change));
}
}
@@ -207,22 +195,13 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueAction
issue.setFieldValues(fieldValues);
issueFieldUnaryManager.saveFields(issue);
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDescription("batch edited issue");
- lastActivity.setDate(new Date());
- lastActivity.setUser(SecurityUtils.getUser());
- issue.setLastActivity(lastActivity);
- issueManager.save(issue);
-
- IssueAction change = new IssueAction();
+ IssueChange change = new IssueChange();
change.setIssue(issue);
change.setDate(new Date());
- change.setUser(SecurityUtils.getUser());
- change.setData(new BatchUpdateData(prevState, issue.getState(), prevMilestone, issue.getMilestone(), prevFields, issue.getFields(), comment));
+ change.setUser(user);
+ change.setData(new IssueBatchUpdateData(prevState, issue.getState(), prevMilestone, issue.getMilestone(), prevFields, issue.getFields(), comment));
save(change);
-
- listenerRegistry.post(new IssueActionEvent(change));
}
}
@@ -300,10 +279,10 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueAction
@Transactional
@Listen
- public void on(PullRequestActionEvent event) {
- if (event.getAction().getData() instanceof MergedData)
+ public void on(PullRequestChangeEvent event) {
+ if (event.getChange().getData() instanceof PullRequestMergeData)
on(event.getRequest(), MergePullRequest.class);
- else if (event.getAction().getData() instanceof DiscardedData)
+ else if (event.getChange().getData() instanceof PullRequestDiscardData)
on(event.getRequest(), DiscardPullRequest.class);
}
@@ -324,5 +303,5 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueAction
}
}
}
-
+
}
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 c78e308978..19b8407261 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,7 +7,6 @@ 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;
@@ -32,11 +31,6 @@ 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.setDescription("commented");
- comment.getIssue().setLastActivity(lastActivity);
comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()+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 813627960b..55ae6f513c 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
@@ -24,8 +24,13 @@ import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
+import com.google.common.base.Preconditions;
+
+import io.onedev.launcher.loader.Listen;
import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.server.event.issue.IssueCommitted;
import io.onedev.server.event.issue.IssueDeleted;
+import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.manager.IssueFieldUnaryManager;
import io.onedev.server.manager.IssueManager;
@@ -36,9 +41,7 @@ import io.onedev.server.model.IssueQuerySetting;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.issue.IssueBoard;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.workflow.StateSpec;
import io.onedev.server.persistence.annotation.Sessional;
@@ -56,6 +59,7 @@ import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryBuildContext;
import io.onedev.server.search.entity.issue.MilestoneCriteria;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
@@ -95,12 +99,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Transactional
@Override
public void open(Issue issue) {
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDescription("submitted");
- lastActivity.setUser(issue.getSubmitter());
- lastActivity.setDate(issue.getSubmitDate());
- issue.setLastActivity(lastActivity);
-
+ Preconditions.checkArgument(issue.isNew());
Query<?> query = getSession().createQuery("select max(number) from Issue where project=:project");
query.setParameter("project", issue.getProject());
issue.setNumber(getNextNumber(issue.getProject(), query));
@@ -165,6 +164,13 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
return issues;
}
+ @Transactional
+ @Listen
+ public void on(IssueEvent event) {
+ if (!(event instanceof IssueDeleted) && !(event instanceof IssueCommitted))
+ event.getIssue().setUpdateDate(event.getDate());
+ }
+
@Sessional
@Override
public int count(Project project, User user, IssueCriteria issueCriteria) {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
index ccb364aefe..e5c76ae716 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
@@ -11,7 +11,7 @@ import javax.inject.Singleton;
import io.onedev.launcher.loader.Listen;
import io.onedev.server.event.MarkdownAware;
-import io.onedev.server.event.issue.IssueActionEvent;
+import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueCommented;
import io.onedev.server.event.issue.IssueDeleted;
import io.onedev.server.event.issue.IssueEvent;
@@ -22,7 +22,7 @@ import io.onedev.server.manager.MarkdownManager;
import io.onedev.server.manager.UrlManager;
import io.onedev.server.manager.UserInfoManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueWatch;
import io.onedev.server.model.Team;
import io.onedev.server.model.User;
@@ -110,8 +110,8 @@ public class DefaultIssueNotificationManager {
url = urlManager.urlFor(((IssueOpened)event).getIssue());
else if (event instanceof IssueCommented)
url = urlManager.urlFor(((IssueCommented)event).getComment());
- else if (event instanceof IssueActionEvent)
- url = urlManager.urlFor(((IssueActionEvent)event).getAction());
+ else if (event instanceof IssueChangeEvent)
+ url = urlManager.urlFor(((IssueChangeEvent)event).getChange());
else
url = urlManager.urlFor(event.getIssue());
@@ -126,19 +126,25 @@ public class DefaultIssueNotificationManager {
}
}
- if (event instanceof IssueActionEvent) {
- IssueAction issueAction = ((IssueActionEvent) event).getAction();
- for (Team team: issueAction.getData().getNewTeams(issue.getProject()).values()) {
- for (User member: team.getMembers())
- watch(issue, member, true);
+ if (event instanceof IssueChangeEvent) {
+ IssueChange change = ((IssueChangeEvent) event).getChange();
+ Map<String, Team> newTeams = change.getData().getNewTeams(issue.getProject());
+ if (newTeams != null) {
+ for (Team team: newTeams.values()) {
+ for (User member: team.getMembers())
+ watch(issue, member, true);
+ }
}
String url = urlManager.urlFor(issue);
- for (Map.Entry<String, User> entry: issueAction.getData().getNewUsers(issue.getProject()).entrySet()) {
- String subject = String.format("You are designated as \"%s\" of issue #%d: %s",
- entry.getKey(), issue.getNumber(), issue.getTitle());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- mailManager.sendMailAsync(Lists.newArrayList(entry.getValue().getEmail()), subject, body.toString());
- notifiedUsers.add(entry.getValue());
+ Map<String, User> newUsers = change.getData().getNewUsers(issue.getProject());
+ if (newUsers != null) {
+ for (Map.Entry<String, User> entry: newUsers.entrySet()) {
+ String subject = String.format("You are designated as \"%s\" of issue #%d: %s",
+ entry.getKey(), issue.getNumber(), issue.getTitle());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ mailManager.sendMailAsync(Lists.newArrayList(entry.getValue().getEmail()), subject, body.toString());
+ notifiedUsers.add(entry.getValue());
+ }
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
index f6eb51884c..aacccf46cf 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
@@ -14,15 +14,15 @@ import com.google.common.base.Preconditions;
import io.onedev.launcher.loader.Listen;
import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.issue.IssueActionEvent;
+import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.manager.MilestoneManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.changedata.BatchUpdateData;
-import io.onedev.server.model.support.issue.changedata.MilestoneChangeData;
-import io.onedev.server.model.support.issue.changedata.StateChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;
+import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
import io.onedev.server.model.support.issue.workflow.StateSpec;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
@@ -174,17 +174,17 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im
@Transactional
@Listen
- public void on(IssueActionEvent event) {
+ public void on(IssueChangeEvent event) {
Project project = event.getIssue().getProject();
- if (event.getAction().getData() instanceof BatchUpdateData) {
- BatchUpdateData data = (BatchUpdateData) event.getAction().getData();
+ if (event.getChange().getData() instanceof IssueBatchUpdateData) {
+ IssueBatchUpdateData data = (IssueBatchUpdateData) event.getChange().getData();
onStateChange(project, data.getOldMilestone(), data.getOldState(), data.getNewState());
onMilestoneChange(project, data.getNewState(), data.getOldMilestone(), data.getNewMilestone());
- } else if (event.getAction().getData() instanceof StateChangeData) {
- StateChangeData data = (StateChangeData) event.getAction().getData();
+ } else if (event.getChange().getData() instanceof IssueStateChangeData) {
+ IssueStateChangeData data = (IssueStateChangeData) event.getChange().getData();
onStateChange(project, event.getIssue().getMilestoneName(), data.getOldState(), data.getNewState());
- } else if (event.getAction().getData() instanceof MilestoneChangeData) {
- MilestoneChangeData data = (MilestoneChangeData) event.getAction().getData();
+ } else if (event.getChange().getData() instanceof IssueMilestoneChangeData) {
+ IssueMilestoneChangeData data = (IssueMilestoneChangeData) event.getChange().getData();
onMilestoneChange(project, event.getIssue().getState(), data.getOldMilestone(), data.getNewMilestone());
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestActionManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestActionManager.java
deleted file mode 100644
index 19da8f76a6..0000000000
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestActionManager.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package io.onedev.server.manager.impl;
-
-import java.util.Date;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.onedev.launcher.loader.ListenerRegistry;
-import io.onedev.server.event.pullrequest.PullRequestActionEvent;
-import io.onedev.server.manager.PullRequestActionManager;
-import io.onedev.server.manager.UserManager;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestAction;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.model.support.pullrequest.actiondata.ChangedMergeStrategyData;
-import io.onedev.server.model.support.pullrequest.actiondata.ChangedTitleData;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-
-@Singleton
-public class DefaultPullRequestActionManager extends AbstractEntityManager<PullRequestAction>
- implements PullRequestActionManager {
-
- private final UserManager userManager;
-
- private final ListenerRegistry listenerRegistry;
-
- @Inject
- public DefaultPullRequestActionManager(Dao dao, UserManager userManager, ListenerRegistry listenerRegistry) {
- super(dao);
- this.userManager = userManager;
- this.listenerRegistry = listenerRegistry;
- }
-
- @Transactional
- @Override
- public void save(PullRequestAction action) {
- dao.persist(action);
- listenerRegistry.post(new PullRequestActionEvent(action));
- }
-
- @Transactional
- @Override
- public void changeMergeStrategy(PullRequest request, MergeStrategy mergeStrategy, @Nullable User user) {
- PullRequestAction action = new PullRequestAction();
- action.setDate(new Date());
- action.setRequest(request);
- action.setData(new ChangedMergeStrategyData(request.getMergeStrategy(), mergeStrategy));
- action.setUser(userManager.getCurrent());
- save(action);
- request.setMergeStrategy(mergeStrategy);
- }
-
- @Transactional
- @Override
- public void changeTitle(PullRequest request, String title, @Nullable User user) {
- PullRequestAction action = new PullRequestAction();
- action.setDate(new Date());
- action.setRequest(request);
- action.setData(new ChangedTitleData(request.getTitle(), title));
- action.setUser(userManager.getCurrent());
- save(action);
- request.setTitle(title);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestChangeManager.java
new file mode 100644
index 0000000000..b282ed34f6
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestChangeManager.java
@@ -0,0 +1,88 @@
+package io.onedev.server.manager.impl;
+
+import java.util.Date;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import com.google.common.base.Objects;
+
+import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
+import io.onedev.server.manager.PullRequestChangeManager;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.pullrequest.MergeStrategy;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultPullRequestChangeManager extends AbstractEntityManager<PullRequestChange>
+ implements PullRequestChangeManager {
+
+ private final ListenerRegistry listenerRegistry;
+
+ @Inject
+ public DefaultPullRequestChangeManager(Dao dao, ListenerRegistry listenerRegistry) {
+ super(dao);
+ this.listenerRegistry = listenerRegistry;
+ }
+
+ @Transactional
+ @Override
+ public void save(PullRequestChange change) {
+ dao.persist(change);
+ listenerRegistry.post(new PullRequestChangeEvent(change));
+ }
+
+ @Transactional
+ @Override
+ public void changeMergeStrategy(PullRequest request, MergeStrategy mergeStrategy, @Nullable User user) {
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setRequest(request);
+ change.setData(new PullRequestMergeStrategyChangeData(request.getMergeStrategy(), mergeStrategy));
+ change.setUser(user);
+ save(change);
+ request.setMergeStrategy(mergeStrategy);
+ }
+
+ @Transactional
+ @Override
+ public void changeTitle(PullRequest request, String title, @Nullable User user) {
+ String prevTitle = request.getTitle();
+ if (!title.equals(prevTitle)) {
+ request.setTitle(title);
+
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setRequest(request);
+ change.setData(new PullRequestTitleChangeData(prevTitle, title));
+ change.setUser(user);
+ save(change);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void changeDescription(PullRequest request, @Nullable String description, @Nullable User user) {
+ String prevDescription = request.getDescription();
+ if (!Objects.equal(prevDescription, description)) {
+ request.setDescription(description);
+
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setRequest(request);
+ change.setData(new PullRequestDescriptionChangeData(prevDescription, description));
+ change.setUser(user);
+ save(change);
+ }
+ }
+
+}
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 7aec25cffe..d223f49cd4 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
@@ -4,12 +4,10 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import io.onedev.launcher.loader.ListenerRegistry;
-import io.onedev.server.event.pullrequest.PullRequestCommentAdded;
+import io.onedev.server.event.pullrequest.PullRequestCommentCreated;
import io.onedev.server.manager.PullRequestCommentManager;
-import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
-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;
@@ -20,15 +18,10 @@ public class DefaultPullRequestCommentManager extends AbstractEntityManager<Pull
private final ListenerRegistry listenerRegistry;
- private final PullRequestManager pullRequestManager;
-
@Inject
- public DefaultPullRequestCommentManager(Dao dao, PullRequestManager pullRequestManager,
- ListenerRegistry listenerRegistry) {
+ public DefaultPullRequestCommentManager(Dao dao, ListenerRegistry listenerRegistry) {
super(dao);
-
this.listenerRegistry = listenerRegistry;
- this.pullRequestManager = pullRequestManager;
}
@Transactional
@@ -37,18 +30,11 @@ public class DefaultPullRequestCommentManager extends AbstractEntityManager<Pull
boolean isNew = comment.isNew();
dao.persist(comment);
if (isNew) {
- PullRequestCommentAdded event = new PullRequestCommentAdded(comment);
+ PullRequestCommentCreated event = new PullRequestCommentCreated(comment);
listenerRegistry.post(event);
- LastActivity lastEvent = new LastActivity();
- lastEvent.setDate(event.getDate());
- lastEvent.setDescription("added comment");
- lastEvent.setUser(event.getUser());
-
PullRequest request = comment.getRequest();
request.setCommentCount(request.getCommentCount()+1);
- request.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 feb7344e56..71c5dcc40b 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
@@ -59,9 +59,10 @@ import io.onedev.server.OneDev;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.pullrequest.PullRequestActionEvent;
import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
+import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestDeleted;
+import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.exception.OneException;
@@ -72,8 +73,8 @@ import io.onedev.server.manager.BuildManager;
import io.onedev.server.manager.CommitInfoManager;
import io.onedev.server.manager.ConfigurationManager;
import io.onedev.server.manager.MarkdownManager;
-import io.onedev.server.manager.PullRequestActionManager;
import io.onedev.server.manager.PullRequestBuildManager;
+import io.onedev.server.manager.PullRequestChangeManager;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.manager.PullRequestReviewManager;
import io.onedev.server.manager.PullRequestUpdateManager;
@@ -82,30 +83,28 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Configuration;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestAction;
import io.onedev.server.model.PullRequestBuild;
+import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.model.Team;
import io.onedev.server.model.User;
import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.FileProtection;
-import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.ProjectAndBranch;
import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
-import io.onedev.server.model.support.pullrequest.actiondata.ActionData;
-import io.onedev.server.model.support.pullrequest.actiondata.AddedReviewerData;
-import io.onedev.server.model.support.pullrequest.actiondata.ApprovedData;
-import io.onedev.server.model.support.pullrequest.actiondata.ChangedMergeStrategyData;
-import io.onedev.server.model.support.pullrequest.actiondata.DeletedSourceBranchData;
-import io.onedev.server.model.support.pullrequest.actiondata.DiscardedData;
-import io.onedev.server.model.support.pullrequest.actiondata.MergedData;
-import io.onedev.server.model.support.pullrequest.actiondata.RemovedReviewerData;
-import io.onedev.server.model.support.pullrequest.actiondata.ReopenedData;
-import io.onedev.server.model.support.pullrequest.actiondata.RestoredSourceBranchData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchDeleteData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchRestoreData;
import io.onedev.server.persistence.UnitOfWork;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
@@ -122,6 +121,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ProjectPrivilege;
import io.onedev.server.util.BatchWorker;
+import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
@@ -152,7 +152,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
private final BatchWorkManager batchWorkManager;
- private final PullRequestActionManager pullRequestActionManager;
+ private final PullRequestChangeManager pullRequestChangeManager;
private final ConfigurationManager configurationManager;
@@ -163,7 +163,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
PullRequestReviewManager pullRequestReviewManager, UserManager userManager,
MarkdownManager markdownManager, BatchWorkManager batchWorkManager,
ListenerRegistry listenerRegistry, UnitOfWork unitOfWork,
- PullRequestActionManager pullRequestActionManager, BuildManager buildManager,
+ PullRequestChangeManager pullRequestChangeManager, BuildManager buildManager,
ConfigurationManager configurationManager, PullRequestBuildManager pullRequestBuildManager) {
super(dao);
@@ -174,7 +174,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
this.batchWorkManager = batchWorkManager;
this.unitOfWork = unitOfWork;
this.listenerRegistry = listenerRegistry;
- this.pullRequestActionManager = pullRequestActionManager;
+ this.pullRequestChangeManager = pullRequestChangeManager;
this.configurationManager = configurationManager;
this.pullRequestBuildManager = pullRequestBuildManager;
}
@@ -208,12 +208,12 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
request.getSourceProject().cacheObjectId(request.getSourceBranch(), latestCommit.copy());
- PullRequestAction action = new PullRequestAction();
- action.setDate(new Date());
- action.setData(new RestoredSourceBranchData(note));
- action.setRequest(request);
- action.setUser(userManager.getCurrent());
- pullRequestActionManager.save(action);
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setData(new PullRequestSourceBranchRestoreData(note));
+ change.setRequest(request);
+ change.setUser(userManager.getCurrent());
+ pullRequestChangeManager.save(change);
}
}
@@ -225,12 +225,12 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
if (request.getSource().getObjectName(false) != null) {
request.getSource().delete();
- PullRequestAction action = new PullRequestAction();
- action.setDate(new Date());
- action.setData(new DeletedSourceBranchData(note));
- action.setRequest(request);
- action.setUser(userManager.getCurrent());
- pullRequestActionManager.save(action);
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setData(new PullRequestSourceBranchDeleteData(note));
+ change.setRequest(request);
+ change.setUser(userManager.getCurrent());
+ pullRequestChangeManager.save(change);
}
}
@@ -240,12 +240,12 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
User user = userManager.getCurrent();
request.setCloseInfo(null);
- PullRequestAction action = new PullRequestAction();
- action.setDate(new Date());
- action.setData(new ReopenedData(note));
- action.setRequest(request);
- action.setUser(user);
- pullRequestActionManager.save(action);
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setData(new PullRequestReopenData(note));
+ change.setRequest(request);
+ change.setUser(user);
+ pullRequestChangeManager.save(change);
checkAsync(request);
}
@@ -261,12 +261,12 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
closeInfo.setStatus(CloseInfo.Status.DISCARDED);
request.setCloseInfo(closeInfo);
- PullRequestAction action = new PullRequestAction();
- action.setDate(date);
- action.setData(new DiscardedData(note));
- action.setRequest(request);
- action.setUser(user);
- pullRequestActionManager.save(action);
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(date);
+ change.setData(new PullRequestDiscardData(note));
+ change.setRequest(request);
+ change.setUser(user);
+ pullRequestChangeManager.save(change);
}
private void merge(PullRequest request) {
@@ -342,16 +342,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Transactional
@Override
public void open(PullRequest request) {
+ Preconditions.checkArgument(request.isNew());
Query<?> query = getSession().createQuery("select max(number) from PullRequest where targetProject=:project");
query.setParameter("project", request.getTargetProject());
request.setNumber(getNextNumber(request.getTargetProject(), query));
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDescription("submitted");
- lastActivity.setUser(request.getSubmitter());
- lastActivity.setDate(request.getSubmitDate());
- request.setLastActivity(lastActivity);
-
dao.persist(request);
RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getBaseRef());
@@ -388,11 +383,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
if (dueToMerged)
reason = "closed pull request as source branch is merged into target branch";
- PullRequestAction action = new PullRequestAction();
- action.setDate(date);
- action.setData(new MergedData(reason));
- action.setRequest(request);
- pullRequestActionManager.save(action);
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(date);
+ change.setData(new PullRequestMergeData(reason));
+ change.setRequest(request);
+ pullRequestChangeManager.save(change);
}
private void checkUpdate(PullRequest request) {
@@ -617,16 +612,23 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Transactional
@Listen
- public void on(PullRequestActionEvent event) {
- event.getRequest().setLastActivity(event);
- ActionData data = event.getAction().getData();
- if (data instanceof ApprovedData || data instanceof DiscardedData
- || data instanceof RemovedReviewerData || data instanceof AddedReviewerData
- || data instanceof ChangedMergeStrategyData) {
+ public void on(PullRequestChangeEvent event) {
+ PullRequestChangeData data = event.getChange().getData();
+ if (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData
+ || data instanceof PullRequestReviewerRemoveData || data instanceof PullRequestReviewerAddData
+ || data instanceof PullRequestMergeStrategyChangeData) {
checkAsync(event.getRequest());
}
}
+ @Transactional
+ @Listen
+ public void on(PullRequestEvent event) {
+ if (!(event instanceof PullRequestDeleted) && !(event instanceof PullRequestMergePreviewCalculated)
+ && !(event instanceof PullRequestBuildEvent))
+ event.getRequest().setUpdateDate(event.getDate());
+ }
+
@Listen
@Transactional
public void on(BuildEvent event) {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java
index bc2c8bbd2c..a77f5ae5bb 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java
@@ -17,12 +17,12 @@ import com.google.common.collect.Lists;
import io.onedev.launcher.loader.Listen;
import io.onedev.server.event.MarkdownAware;
-import io.onedev.server.event.pullrequest.PullRequestActionEvent;
+import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
-import io.onedev.server.event.pullrequest.PullRequestCodeCommentAdded;
+import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;
-import io.onedev.server.event.pullrequest.PullRequestCommentAdded;
+import io.onedev.server.event.pullrequest.PullRequestCommentCreated;
import io.onedev.server.event.pullrequest.PullRequestDeleted;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
@@ -39,12 +39,12 @@ import io.onedev.server.model.PullRequestWatch;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.model.support.pullrequest.actiondata.ActionData;
-import io.onedev.server.model.support.pullrequest.actiondata.ApprovedData;
-import io.onedev.server.model.support.pullrequest.actiondata.DiscardedData;
-import io.onedev.server.model.support.pullrequest.actiondata.MergedData;
-import io.onedev.server.model.support.pullrequest.actiondata.ReopenedData;
-import io.onedev.server.model.support.pullrequest.actiondata.RequestedForChangesData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;
import io.onedev.server.persistence.PersistListener;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.search.entity.EntityQuery;
@@ -124,12 +124,12 @@ public class DefaultPullRequestNotificationManager implements PersistListener {
watch(request, mentionedUser, true);
String url;
- if (event instanceof PullRequestCommentAdded)
- url = urlManager.urlFor(((PullRequestCommentAdded)event).getComment());
- else if (event instanceof PullRequestActionEvent)
- url = urlManager.urlFor(((PullRequestActionEvent)event).getAction());
- else if (event instanceof PullRequestCodeCommentAdded)
- url = urlManager.urlFor(((PullRequestCodeCommentAdded)event).getComment(), request);
+ if (event instanceof PullRequestCommentCreated)
+ url = urlManager.urlFor(((PullRequestCommentCreated)event).getComment());
+ else if (event instanceof PullRequestChangeEvent)
+ url = urlManager.urlFor(((PullRequestChangeEvent)event).getChange());
+ else if (event instanceof PullRequestCodeCommentCreated)
+ url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment(), request);
else if (event instanceof PullRequestCodeCommentReplied)
url = urlManager.urlFor(((PullRequestCodeCommentReplied)event).getReply(), request);
else
@@ -146,14 +146,14 @@ public class DefaultPullRequestNotificationManager implements PersistListener {
}
}
- if (event instanceof PullRequestActionEvent) {
- PullRequestActionEvent actionEvent = (PullRequestActionEvent) event;
- ActionData actionData = actionEvent.getAction().getData();
+ if (event instanceof PullRequestChangeEvent) {
+ PullRequestChangeEvent actionEvent = (PullRequestChangeEvent) event;
+ PullRequestChangeData actionData = actionEvent.getChange().getData();
String subject = null;
- if (actionData instanceof ApprovedData) {
+ if (actionData instanceof PullRequestApproveData) {
subject = String.format(user.getDisplayName() + " approved pull request #%d - %s",
request.getNumber(), request.getTitle());
- } else if (actionData instanceof RequestedForChangesData) {
+ } else if (actionData instanceof PullRequestRequestedForChangesData) {
subject = String.format(user.getDisplayName() + " requested changes for pull request #%d - %s",
request.getNumber(), request.getTitle());
}
@@ -184,11 +184,11 @@ public class DefaultPullRequestNotificationManager implements PersistListener {
}
boolean notifyWatchers = false;
- if (event instanceof PullRequestActionEvent) {
- ActionData actionData = ((PullRequestActionEvent) event).getAction().getData();
- if (actionData instanceof ApprovedData || actionData instanceof RequestedForChangesData
- || actionData instanceof MergedData || actionData instanceof DiscardedData
- || actionData instanceof ReopenedData) {
+ if (event instanceof PullRequestChangeEvent) {
+ PullRequestChangeData actionData = ((PullRequestChangeEvent) event).getChange().getData();
+ if (actionData instanceof PullRequestApproveData || actionData instanceof PullRequestRequestedForChangesData
+ || actionData instanceof PullRequestMergeData || actionData instanceof PullRequestDiscardData
+ || actionData instanceof PullRequestReopenData) {
notifyWatchers = true;
}
} else if (!(event instanceof PullRequestMergePreviewCalculated || event instanceof PullRequestBuildEvent)) {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReviewManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReviewManager.java
index db1bf900dc..56c7a787c4 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReviewManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReviewManager.java
@@ -10,18 +10,18 @@ import javax.persistence.Query;
import org.hibernate.criterion.Restrictions;
-import io.onedev.server.manager.PullRequestActionManager;
+import io.onedev.server.manager.PullRequestChangeManager;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.manager.PullRequestReviewManager;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestAction;
+import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.ReviewResult;
-import io.onedev.server.model.support.pullrequest.actiondata.AddedReviewerData;
-import io.onedev.server.model.support.pullrequest.actiondata.ApprovedData;
-import io.onedev.server.model.support.pullrequest.actiondata.RemovedReviewerData;
-import io.onedev.server.model.support.pullrequest.actiondata.RequestedForChangesData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
@@ -33,29 +33,29 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
private final PullRequestManager pullRequestManager;
- private final PullRequestActionManager pullRequestActionManager;
+ private final PullRequestChangeManager pullRequestChangeManager;
@Inject
- public DefaultPullRequestReviewManager(Dao dao, PullRequestManager pullRequestManager, PullRequestActionManager pullRequestActionManager) {
+ public DefaultPullRequestReviewManager(Dao dao, PullRequestManager pullRequestManager, PullRequestChangeManager pullRequestChangeManager) {
super(dao);
this.pullRequestManager = pullRequestManager;
- this.pullRequestActionManager = pullRequestActionManager;
+ this.pullRequestChangeManager = pullRequestChangeManager;
}
@Transactional
@Override
public void review(PullRequestReview review) {
ReviewResult result = review.getResult();
- PullRequestAction action = new PullRequestAction();
- action.setDate(new Date());
- action.setRequest(review.getRequest());
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setRequest(review.getRequest());
if (result.isApproved())
- action.setData(new ApprovedData(result.getComment()));
+ change.setData(new PullRequestApproveData(result.getComment()));
else
- action.setData(new RequestedForChangesData(result.getComment()));
- action.setUser(review.getUser());
- pullRequestActionManager.save(action);
+ change.setData(new PullRequestRequestedForChangesData(result.getComment()));
+ change.setUser(review.getUser());
+ pullRequestChangeManager.save(change);
save(review);
}
@@ -80,12 +80,12 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
} else {
save(review);
- PullRequestAction action = new PullRequestAction();
- action.setDate(new Date());
- action.setRequest(request);
- action.setUser(SecurityUtils.getUser());
- action.setData(new RemovedReviewerData(reviewer.getDisplayName()));
- pullRequestActionManager.save(action);
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setRequest(request);
+ change.setUser(SecurityUtils.getUser());
+ change.setData(new PullRequestReviewerRemoveData(reviewer.getDisplayName()));
+ pullRequestChangeManager.save(change);
return true;
}
}
@@ -97,12 +97,12 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
PullRequest request = review.getRequest();
- PullRequestAction action = new PullRequestAction();
- action.setDate(new Date());
- action.setRequest(request);
- action.setData(new AddedReviewerData(review.getUser().getDisplayName()));
- action.setUser(SecurityUtils.getUser());
- pullRequestActionManager.save(action);
+ PullRequestChange change = new PullRequestChange();
+ change.setDate(new Date());
+ change.setRequest(request);
+ change.setData(new PullRequestReviewerAddData(review.getUser().getDisplayName()));
+ change.setUser(SecurityUtils.getUser());
+ pullRequestChangeManager.save(change);
}
@Transactional
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 33d0188f9e..1d8eb89c0c 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,6 @@ 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.LastActivity;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -88,11 +87,6 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullR
if (independent) {
PullRequestUpdated event = new PullRequestUpdated(update);
listenerRegistry.post(event);
-
- LastActivity lastEvent = new LastActivity();
- lastEvent.setDate(event.getDate());
- lastEvent.setDescription("added new commits");
- request.setLastActivity(lastEvent);
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java
index b858d70638..e805fc36c9 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java
@@ -11,6 +11,7 @@ import org.joda.time.DateTime;
import com.google.common.collect.Lists;
import io.onedev.launcher.loader.Listen;
+import io.onedev.server.event.codecomment.CodeCommentDeleted;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.issue.IssueDeleted;
@@ -254,13 +255,14 @@ public class DefaultUserInfoManager extends AbstractEnvironmentManager implement
@Listen
public void on(IssueEvent event) {
- if (!(event instanceof IssueDeleted))
+ if (event.getUser() != null && !(event instanceof IssueDeleted))
visitIssue(event.getUser(), event.getIssue());
}
@Listen
public void on(CodeCommentEvent event) {
- visitCodeComment(event.getUser(), event.getComment());
+ if (event.getUser() != null && !(event instanceof CodeCommentDeleted))
+ visitCodeComment(event.getUser(), event.getComment());
}
@Listen
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 1c828934f9..219b050fa4 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
@@ -103,7 +103,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
query.setParameter("userName", user.getDisplayName());
query.executeUpdate();
- query = getSession().createQuery("update PullRequestAction set user=null, userName=:userName where user=:user");
+ query = getSession().createQuery("update PullRequestChange set user=null, userName=:userName where user=:user");
query.setParameter("user", user);
query.setParameter("userName", user.getDisplayName());
query.executeUpdate();
@@ -134,7 +134,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
query.setParameter("userName", user.getDisplayName());
query.executeUpdate();
- query = getSession().createQuery("update IssueAction set user=null, userName=:userName where user=:user");
+ query = getSession().createQuery("update IssueChange set user=null, userName=:userName where user=:user");
query.setParameter("user", user);
query.setParameter("userName", user.getDisplayName());
query.executeUpdate();
diff --git a/core/src/main/java/io/onedev/server/model/BuildQuerySetting.java b/core/src/main/java/io/onedev/server/model/BuildQuerySetting.java
index c8781f3c9d..6cf529db2f 100644
--- a/core/src/main/java/io/onedev/server/model/BuildQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/BuildQuerySetting.java
@@ -12,10 +12,10 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
+import io.onedev.server.model.support.NamedBuildQuery;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.model.support.QuerySubscriptionSupport;
-import io.onedev.server.model.support.QueryWatchSupport;
-import io.onedev.server.model.support.build.NamedBuildQuery;
+import io.onedev.server.util.watch.QuerySubscriptionSupport;
+import io.onedev.server.util.watch.QueryWatchSupport;
@Entity
@Table(
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 2143f5d4b7..2f3b8c40f0 100644
--- a/core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -32,19 +32,16 @@ import org.hibernate.annotations.DynamicUpdate;
import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
-import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.UserInfoManager;
import io.onedev.server.model.support.CompareContext;
-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;
import io.onedev.server.util.diff.DiffUtils;
import io.onedev.server.util.diff.WhitespaceOption;
-import io.onedev.server.web.editable.EditableUtils;
/*
* @DynamicUpdate annotation here along with various @OptimisticLock annotations
@@ -54,7 +51,8 @@ import io.onedev.server.web.editable.EditableUtils;
@Entity
@Table(indexes={
@Index(columnList="g_project_id"), @Index(columnList="g_user_id"),
- @Index(columnList="commit"), @Index(columnList="path")})
+ @Index(columnList="commit"), @Index(columnList="path"),
+ @Index(columnList="createDate"), @Index(columnList="updateDate")})
@DynamicUpdate
public class CodeComment extends AbstractEntity {
@@ -75,10 +73,10 @@ public class CodeComment extends AbstractEntity {
private String content;
@Column(nullable=false)
- private Date date = new Date();
+ private Date createDate = new Date();
- @Embedded
- private LastActivity lastActivity;
+ @Column(nullable=false)
+ private Date updateDate = new Date();
private int replyCount;
@@ -133,12 +131,12 @@ public class CodeComment extends AbstractEntity {
this.content = content;
}
- public Date getDate() {
- return date;
+ public Date getCreateDate() {
+ return createDate;
}
- public void setDate(Date date) {
- this.date = date;
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
}
public int getReplyCount() {
@@ -189,22 +187,14 @@ public class CodeComment extends AbstractEntity {
this.compareContext = compareContext;
}
- public LastActivity getLastActivity() {
- return lastActivity;
+ public Date getUpdateDate() {
+ return updateDate;
}
- public void setLastActivity(LastActivity lastActivity) {
- this.lastActivity = lastActivity;
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
}
- public void setLastActivity(CodeCommentEvent event) {
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDate(event.getDate());
- lastActivity.setDescription(EditableUtils.getDisplayName(event.getClass()));
- lastActivity.setUser(event.getUser());
- setLastActivity(lastActivity);
- }
-
public boolean isVisitedAfter(Date date) {
User user = SecurityUtils.getUser();
if (user != null) {
diff --git a/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java b/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
index fdfb6b5d0a..21b4b3e826 100644
--- a/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
@@ -12,10 +12,10 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
+import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.model.support.QuerySubscriptionSupport;
-import io.onedev.server.model.support.QueryWatchSupport;
-import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;
+import io.onedev.server.util.watch.QuerySubscriptionSupport;
+import io.onedev.server.util.watch.QueryWatchSupport;
@Entity
@Table(
diff --git a/core/src/main/java/io/onedev/server/model/CodeCommentReply.java b/core/src/main/java/io/onedev/server/model/CodeCommentReply.java
index 8129a2ab2d..1697238179 100644
--- a/core/src/main/java/io/onedev/server/model/CodeCommentReply.java
+++ b/core/src/main/java/io/onedev/server/model/CodeCommentReply.java
@@ -12,16 +12,8 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.hibernate.annotations.DynamicUpdate;
-
-/*
- * @DynamicUpdate annotation here along with various @OptimisticLock annotations
- * on certain fields tell Hibernate not to perform version check on those fields
- * which can be updated from background thread.
- */
@Entity
@Table(indexes={@Index(columnList="g_comment_id"), @Index(columnList="g_user_id")})
-@DynamicUpdate
public class CodeCommentReply extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java b/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java
index 3abfab0631..03219d413e 100644
--- a/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/CommitQuerySetting.java
@@ -15,8 +15,8 @@ import javax.persistence.UniqueConstraint;
import io.onedev.server.model.support.NamedCommitQuery;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.model.support.QuerySubscriptionSupport;
-import io.onedev.server.model.support.QueryWatchSupport;
+import io.onedev.server.util.watch.QuerySubscriptionSupport;
+import io.onedev.server.util.watch.QueryWatchSupport;
@Entity
@Table(
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 4dff3d67d9..08c1d218c7 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -16,7 +16,6 @@ import java.util.stream.Collectors;
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;
@@ -32,8 +31,6 @@ import org.apache.commons.lang.SerializationUtils;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.collect.Lists;
@@ -43,11 +40,10 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.CommitInfoManager;
import io.onedev.server.manager.UserInfoManager;
import io.onedev.server.model.support.EntityWatch;
-import io.onedev.server.model.support.LastActivity;
-import io.onedev.server.model.support.Referenceable;
-import io.onedev.server.model.support.issue.IssueField;
import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.IssueField;
+import io.onedev.server.util.Referenceable;
import io.onedev.server.util.facade.IssueFacade;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.jackson.DefaultView;
@@ -67,9 +63,8 @@ import io.onedev.server.web.editable.annotation.Editable;
@Index(columnList="number"), @Index(columnList="numberStr"),
@Index(columnList="submitDate"), @Index(columnList="g_submitter_id"),
@Index(columnList="voteCount"), @Index(columnList="commentCount"),
- @Index(columnList="g_milestone_id"), @Index(columnList="LAST_ACT_DATE")},
+ @Index(columnList="g_milestone_id"), @Index(columnList="updateDate")},
uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "number"})})
-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@Editable
public class Issue extends AbstractEntity implements Referenceable {
@@ -122,8 +117,8 @@ public class Issue extends AbstractEntity implements Referenceable {
@JsonView(DefaultView.class)
private String noSpaceTitle;
- @Embedded
- private LastActivity lastActivity;
+ @Column(nullable=false)
+ private Date updateDate = new Date();
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
private Collection<IssueFieldUnary> fieldUnaries = new ArrayList<>();
@@ -132,7 +127,7 @@ public class Issue extends AbstractEntity implements Referenceable {
private Collection<IssueComment> comments = new ArrayList<>();
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
- private Collection<IssueAction> actions = new ArrayList<>();
+ private Collection<IssueChange> changes = new ArrayList<>();
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
private Collection<IssueVote> votes = new ArrayList<>();
@@ -234,12 +229,12 @@ public class Issue extends AbstractEntity implements Referenceable {
this.comments = comments;
}
- public Collection<IssueAction> getActions() {
- return actions;
+ public Collection<IssueChange> getChanges() {
+ return changes;
}
- public void setChanges(Collection<IssueAction> actions) {
- this.actions = actions;
+ public void setChanges(Collection<IssueChange> changes) {
+ this.changes = changes;
}
public Collection<IssueVote> getVotes() {
@@ -299,12 +294,12 @@ public class Issue extends AbstractEntity implements Referenceable {
this.fieldUnaries = fieldUnaries;
}
- public LastActivity getLastActivity() {
- return lastActivity;
+ public Date getUpdateDate() {
+ return updateDate;
}
- public void setLastActivity(LastActivity lastActivity) {
- this.lastActivity = lastActivity;
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
}
public boolean isVisitedAfter(Date date) {
diff --git a/core/src/main/java/io/onedev/server/model/IssueAction.java b/core/src/main/java/io/onedev/server/model/IssueChange.java
similarity index 84%
rename from core/src/main/java/io/onedev/server/model/IssueAction.java
rename to core/src/main/java/io/onedev/server/model/IssueChange.java
index e042c6d9ff..d781f8a301 100644
--- a/core/src/main/java/io/onedev/server/model/IssueAction.java
+++ b/core/src/main/java/io/onedev/server/model/IssueChange.java
@@ -11,12 +11,12 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import io.onedev.server.model.support.issue.changedata.ActionData;
+import io.onedev.server.model.support.issue.changedata.IssueChangeData;
@Entity
@Table(indexes={
@Index(columnList="g_issue_id"), @Index(columnList="g_user_id")})
-public class IssueAction extends AbstractEntity {
+public class IssueChange extends AbstractEntity {
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ public class IssueAction extends AbstractEntity {
@Lob
@Column(length=65535)
- private ActionData data;
+ private IssueChangeData data;
public Issue getIssue() {
return issue;
@@ -69,11 +69,11 @@ public class IssueAction extends AbstractEntity {
this.date = date;
}
- public ActionData getData() {
+ public IssueChangeData getData() {
return data;
}
- public void setData(ActionData data) {
+ public void setData(IssueChangeData data) {
this.data = data;
}
diff --git a/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java b/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
index 74a932ef4c..d336f9c635 100644
--- a/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
@@ -14,9 +14,9 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.model.support.QuerySubscriptionSupport;
-import io.onedev.server.model.support.QueryWatchSupport;
import io.onedev.server.model.support.issue.NamedIssueQuery;
+import io.onedev.server.util.watch.QuerySubscriptionSupport;
+import io.onedev.server.util.watch.QueryWatchSupport;
@Entity
@Table(
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java
index 7245d8d26d..675714b3ee 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -88,19 +88,19 @@ import io.onedev.server.manager.StorageManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.CommitMessageTransformSetting;
+import io.onedev.server.model.support.NamedBuildQuery;
+import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.model.support.NamedCommitQuery;
import io.onedev.server.model.support.TagProtection;
import io.onedev.server.model.support.WebHook;
-import io.onedev.server.model.support.build.NamedBuildQuery;
-import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;
import io.onedev.server.model.support.issue.IssueBoard;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.persistence.UnitOfWork;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.util.validation.annotation.ProjectName;
@@ -1151,7 +1151,7 @@ public class Project extends AbstractEntity {
board.setName(IssueConstants.FIELD_STATE);
board.setIdentifyField(IssueConstants.FIELD_STATE);
board.setColumns(Lists.newArrayList("Open", "Assigned", "Closed"));
- board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Type", "Priority", "Assignee"));
+ board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Type", "Priority", "Assignee", "Resolution", "Duplicate With"));
issueBoards.add(board);
}
return issueBoards;
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 0acedab7d5..1d509b9784 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -41,24 +41,20 @@ import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
-import io.onedev.server.event.pullrequest.PullRequestActionEvent;
-import io.onedev.server.event.pullrequest.PullRequestCodeCommentAdded;
-import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.manager.UserInfoManager;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.EntityWatch;
-import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.ProjectAndBranch;
-import io.onedev.server.model.support.Referenceable;
import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueUtils;
+import io.onedev.server.util.PullRequestConstants;
+import io.onedev.server.util.Referenceable;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.util.jackson.RestView;
@@ -75,6 +71,7 @@ import io.onedev.server.util.jackson.RestView;
@Index(columnList="title"), @Index(columnList="uuid"),
@Index(columnList="numberStr"), @Index(columnList="noSpaceTitle"),
@Index(columnList="number"), @Index(columnList="g_targetProject_id"),
+ @Index(columnList="submitDate"), @Index(columnList="updateDate"),
@Index(columnList="g_sourceProject_id"), @Index(columnList="g_submitter_id"),
@Index(columnList="headCommitHash"), @Index(columnList="PREVIEW_REQUEST_HEAD"),
@Index(columnList="CLOSE_DATE"), @Index(columnList="CLOSE_STATUS"),
@@ -119,8 +116,8 @@ public class PullRequest extends AbstractEntity implements Referenceable {
@Column(nullable=false)
private String headCommitHash;
- @Embedded
- private LastActivity lastActivity;
+ @Column(nullable=false)
+ private Date updateDate = new Date();
@Column(nullable=true)
private Date lastCodeCommentActivityDate;
@@ -168,7 +165,7 @@ public class PullRequest extends AbstractEntity implements Referenceable {
private Collection<PullRequestComment> comments = new ArrayList<>();
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
- private Collection<PullRequestAction> actions = new ArrayList<>();
+ private Collection<PullRequestChange> changes = new ArrayList<>();
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
private Collection<PullRequestWatch> watches = new ArrayList<>();
@@ -365,12 +362,12 @@ public class PullRequest extends AbstractEntity implements Referenceable {
this.comments = comments;
}
- public Collection<PullRequestAction> getActions() {
- return actions;
+ public Collection<PullRequestChange> getChanges() {
+ return changes;
}
- public void setActions(Collection<PullRequestAction> actions) {
- this.actions = actions;
+ public void setChanges(Collection<PullRequestChange> changes) {
+ this.changes = changes;
}
@Override
@@ -654,12 +651,12 @@ public class PullRequest extends AbstractEntity implements Referenceable {
}
}
- public LastActivity getLastActivity() {
- return lastActivity;
+ public Date getUpdateDate() {
+ return updateDate;
}
- public void setLastActivity(LastActivity lastActivity) {
- this.lastActivity = lastActivity;
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
}
public Date getLastCodeCommentActivityDate() {
@@ -706,27 +703,6 @@ public class PullRequest extends AbstractEntity implements Referenceable {
return mergedIntoTarget;
}
- public void setLastActivity(PullRequestActionEvent event) {
- PullRequestAction action = event.getAction();
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDate(action.getDate());
- lastActivity.setDescription(action.getData().getDescription());
- lastActivity.setUser(action.getUser());
- setLastActivity(lastActivity);
- }
-
- public void setLastActivity(PullRequestCodeCommentEvent event) {
- LastActivity lastActivity = new LastActivity();
- lastActivity.setDate(event.getDate());
- if (event instanceof PullRequestCodeCommentAdded)
- lastActivity.setDescription("added code comment");
- else
- lastActivity.setDescription("replied code comment");
- lastActivity.setUser(event.getUser());
- setLastActivity(lastActivity);
- setLastCodeCommentActivityDate(event.getDate());
- }
-
@Nullable
public ObjectId getSourceHead() {
ProjectAndBranch projectAndBranch = getSource();
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestAction.java b/core/src/main/java/io/onedev/server/model/PullRequestChange.java
similarity index 82%
rename from core/src/main/java/io/onedev/server/model/PullRequestAction.java
rename to core/src/main/java/io/onedev/server/model/PullRequestChange.java
index e26d155d76..f45e2c63a6 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestAction.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestChange.java
@@ -12,14 +12,11 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.hibernate.annotations.DynamicUpdate;
-
-import io.onedev.server.model.support.pullrequest.actiondata.ActionData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
@Entity
@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id")})
-@DynamicUpdate
-public class PullRequestAction extends AbstractEntity {
+public class PullRequestChange extends AbstractEntity {
private static final long serialVersionUID = 1L;
@@ -38,7 +35,7 @@ public class PullRequestAction extends AbstractEntity {
@Lob
@Column(length=65535)
- private ActionData data;
+ private PullRequestChangeData data;
public PullRequest getRequest() {
return request;
@@ -48,11 +45,11 @@ public class PullRequestAction extends AbstractEntity {
this.request = request;
}
- public ActionData getData() {
+ public PullRequestChangeData getData() {
return data;
}
- public void setData(ActionData data) {
+ public void setData(PullRequestChangeData data) {
this.data = data;
}
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestComment.java b/core/src/main/java/io/onedev/server/model/PullRequestComment.java
index db68837901..274a6c661b 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestComment.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestComment.java
@@ -12,16 +12,8 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.hibernate.annotations.DynamicUpdate;
-
-/*
- * @DynamicUpdate annotation here along with various @OptimisticLock annotations
- * on certain fields tell Hibernate not to perform version check on those fields
- * which can be updated from background thread.
- */
@Entity
@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id")})
-@DynamicUpdate
public class PullRequestComment extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java b/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
index e94a64e397..03eee12e16 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
@@ -14,9 +14,9 @@ import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.model.support.QuerySubscriptionSupport;
-import io.onedev.server.model.support.QueryWatchSupport;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
+import io.onedev.server.util.watch.QuerySubscriptionSupport;
+import io.onedev.server.util.watch.QueryWatchSupport;
@Entity
@Table(
diff --git a/core/src/main/java/io/onedev/server/model/support/LastActivity.java b/core/src/main/java/io/onedev/server/model/support/LastActivity.java
deleted file mode 100644
index 74b8a5c2cf..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/LastActivity.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package io.onedev.server.model.support;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.annotation.Nullable;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-
-import io.onedev.server.model.User;
-
-@Embeddable
-public class LastActivity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @Column(name="LAST_ACT_USER")
- private String userName;
-
- @Column(name="LAST_ACT_ACTION")
- private String description;
-
- @Column(name="LAST_ACT_DATE")
- private Date date;
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Date getDate() {
- return date;
- }
-
- public void setDate(Date date) {
- this.date = date;
- }
-
- @Nullable
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(@Nullable String userName) {
- this.userName = userName;
- }
-
- public void setUser(@Nullable User user) {
- userName = user!=null?user.getDisplayName():null;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java b/core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java
similarity index 88%
rename from core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java
rename to core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java
index ee72a17a1c..f95eabc900 100644
--- a/core/src/main/java/io/onedev/server/model/support/build/NamedBuildQuery.java
+++ b/core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java
@@ -1,8 +1,7 @@
-package io.onedev.server.model.support.build;
+package io.onedev.server.model.support;
import org.hibernate.validator.constraints.NotEmpty;
-import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.web.editable.annotation.BuildQuery;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/model/support/codecomment/NamedCodeCommentQuery.java b/core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java
similarity index 88%
rename from core/src/main/java/io/onedev/server/model/support/codecomment/NamedCodeCommentQuery.java
rename to core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java
index e5b99095cc..d68796f3fb 100644
--- a/core/src/main/java/io/onedev/server/model/support/codecomment/NamedCodeCommentQuery.java
+++ b/core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java
@@ -1,8 +1,7 @@
-package io.onedev.server.model.support.codecomment;
+package io.onedev.server.model.support;
import org.hibernate.validator.constraints.NotEmpty;
-import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.web.editable.annotation.CodeCommentQuery;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/model/support/QuerySetting.java b/core/src/main/java/io/onedev/server/model/support/QuerySetting.java
index c3d9df27b5..57106f4e35 100644
--- a/core/src/main/java/io/onedev/server/model/support/QuerySetting.java
+++ b/core/src/main/java/io/onedev/server/model/support/QuerySetting.java
@@ -8,6 +8,8 @@ import javax.persistence.MappedSuperclass;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.util.watch.QuerySubscriptionSupport;
+import io.onedev.server.util.watch.QueryWatchSupport;
@MappedSuperclass
public abstract class QuerySetting<T extends NamedQuery> extends AbstractEntity {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java
index eab62830a4..14256578bc 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java
@@ -20,6 +20,7 @@ import com.google.common.collect.Lists;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.issue.workflow.StateSpec;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
similarity index 66%
rename from core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java
rename to core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
index 622174b332..71dccdbb09 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/BatchUpdateData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
@@ -9,13 +9,14 @@ import org.apache.wicket.Component;
import com.google.common.base.Objects;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
-import io.onedev.server.model.support.CommentSupport;
-import io.onedev.server.model.support.issue.IssueField;
-import io.onedev.server.web.component.issue.activities.activity.ActionDataPanel;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.IssueField;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.component.issue.activities.activity.DiffAndCommentAwarePanel;
-public class BatchUpdateData extends FieldChangeData {
+public class IssueBatchUpdateData extends IssueFieldChangeData {
private static final long serialVersionUID = 1L;
@@ -29,7 +30,7 @@ public class BatchUpdateData extends FieldChangeData {
private String comment;
- public BatchUpdateData(String oldState, String newState, @Nullable Milestone oldMilestone, @Nullable Milestone newMilestone,
+ public IssueBatchUpdateData(String oldState, String newState, @Nullable Milestone oldMilestone, @Nullable Milestone newMilestone,
Map<String, IssueField> oldFields, Map<String, IssueField> newFields, @Nullable String comment) {
super(oldFields, newFields);
this.oldState = oldState;
@@ -98,21 +99,50 @@ public class BatchUpdateData extends FieldChangeData {
@Override
public void setComment(String comment) {
- BatchUpdateData.this.comment = comment;
+ IssueBatchUpdateData.this.comment = comment;
}
};
}
@Override
- public Component render(String componentId, IssueAction action) {
- return new ActionDataPanel(componentId) {
+ public Component render(String componentId, IssueChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
- protected IssueAction getAction() {
- return action;
+ protected IssueChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return new DiffSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List<String> getOldLines() {
+ return IssueBatchUpdateData.this.getOldLines();
+ }
+
+ @Override
+ public List<String> getNewLines() {
+ return IssueBatchUpdateData.this.getNewLines();
+ }
+
+ @Override
+ public String getOldFileName() {
+ return "a.txt";
+ }
+
+ @Override
+ public String getNewFileName() {
+ return "b.txt";
+ }
+
+ };
}
};
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
similarity index 62%
rename from core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.java
rename to core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
index 5032cd37fa..49eae59ef0 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/ActionData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
@@ -7,27 +7,25 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
import io.onedev.server.model.Team;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.CommentSupport;
-import io.onedev.server.model.support.DiffSupport;
+import io.onedev.server.util.CommentSupport;
-public interface ActionData extends Serializable {
+public interface IssueChangeData extends Serializable {
- Component render(String componentId, IssueAction action);
+ Component render(String componentId, IssueChange change);
String getDescription();
- @Nullable
- DiffSupport getDiffSupport();
-
@Nullable
CommentSupport getCommentSupport();
+ @Nullable
Map<String, User> getNewUsers(Project project);
+ @Nullable
Map<String, Team> getNewTeams(Project project);
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
new file mode 100644
index 0000000000..db5768bce0
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
@@ -0,0 +1,56 @@
+package io.onedev.server.model.support.issue.changedata;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.Team;
+import io.onedev.server.model.User;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
+import io.onedev.utils.StringUtils;
+
+public class IssueDescriptionChangeData implements IssueChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String oldDescription;
+
+ private final String newDescription;
+
+ public IssueDescriptionChangeData(String oldDescription, String newDescription) {
+ this.oldDescription = oldDescription;
+ this.newDescription = newDescription;
+ }
+
+ @Override
+ public Component render(String componentId, IssueChange change) {
+ List<String> oldLines = StringUtils.splitAndTrim(oldDescription, "\n");
+ List<String> newLines = StringUtils.splitAndTrim(newDescription, "\n");
+ return new PlainDiffPanel(componentId, oldLines, "a.txt", newLines, "b.txt", true);
+ }
+
+ @Override
+ public String getDescription() {
+ return "changed description";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+ @Override
+ public Map<String, User> getNewUsers(Project project) {
+ return null;
+ }
+
+ @Override
+ public Map<String, Team> getNewTeams(Project project) {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
similarity index 84%
rename from core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java
rename to core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
index 21a6e4bbe2..a23acc3a74 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/FieldChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
@@ -11,18 +11,17 @@ import org.apache.wicket.Component;
import io.onedev.server.OneDev;
import io.onedev.server.manager.TeamManager;
import io.onedev.server.manager.UserManager;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
import io.onedev.server.model.Team;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.CommentSupport;
-import io.onedev.server.model.support.DiffSupport;
-import io.onedev.server.model.support.issue.IssueField;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.IssueField;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
import io.onedev.utils.StringUtils;
-public class FieldChangeData implements ActionData {
+public class IssueFieldChangeData implements IssueChangeData {
private static final long serialVersionUID = 1L;
@@ -30,7 +29,7 @@ public class FieldChangeData implements ActionData {
protected final Map<String, IssueField> newFields;
- public FieldChangeData(Map<String, IssueField> oldFields, Map<String, IssueField> newFields) {
+ public IssueFieldChangeData(Map<String, IssueField> oldFields, Map<String, IssueField> newFields) {
this.oldFields = copyNonEmptyFields(oldFields);
this.newFields = copyNonEmptyFields(newFields);
}
@@ -119,7 +118,7 @@ public class FieldChangeData implements ActionData {
}
@Override
- public Component render(String componentId, IssueAction action) {
+ public Component render(String componentId, IssueChange change) {
return new PlainDiffPanel(componentId, getOldLines(), "a.txt", getNewLines(), "b.txt", true);
}
@@ -140,35 +139,6 @@ public class FieldChangeData implements ActionData {
return null;
}
- @Override
- public DiffSupport getDiffSupport() {
- return new DiffSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public List<String> getOldLines() {
- return FieldChangeData.this.getOldLines();
- }
-
- @Override
- public List<String> getNewLines() {
- return FieldChangeData.this.getNewLines();
- }
-
- @Override
- public String getOldFileName() {
- return "a.txt";
- }
-
- @Override
- public String getNewFileName() {
- return "b.txt";
- }
-
- };
- }
-
@Override
public Map<String, User> getNewUsers(Project project) {
Map<String, User> newUsers = new HashMap<>();
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java
similarity index 64%
rename from core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java
rename to core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java
index ba1d00c15d..f0f9d95a13 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/MilestoneChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java
@@ -1,7 +1,6 @@
package io.onedev.server.model.support.issue.changedata;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -9,16 +8,15 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.Team;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.CommentSupport;
-import io.onedev.server.model.support.DiffSupport;
+import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-public class MilestoneChangeData implements ActionData {
+public class IssueMilestoneChangeData implements IssueChangeData {
private static final long serialVersionUID = 1L;
@@ -26,13 +24,13 @@ public class MilestoneChangeData implements ActionData {
private final String newMilestone;
- public MilestoneChangeData(@Nullable Milestone oldMilestone, @Nullable Milestone newMilestone) {
+ public IssueMilestoneChangeData(@Nullable Milestone oldMilestone, @Nullable Milestone newMilestone) {
this.oldMilestone = oldMilestone!=null?oldMilestone.getName():null;
this.newMilestone = newMilestone!=null?newMilestone.getName():null;
}
@Override
- public Component render(String componentId, IssueAction action) {
+ public Component render(String componentId, IssueChange change) {
return new PlainDiffPanel(componentId, getOldLines(), "a.txt", getNewLines(), "b.txt", true);
}
@@ -54,35 +52,6 @@ public class MilestoneChangeData implements ActionData {
return newLines;
}
- @Override
- public DiffSupport getDiffSupport() {
- return new DiffSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public List<String> getOldLines() {
- return getOldLines();
- }
-
- @Override
- public List<String> getNewLines() {
- return getNewLines();
- }
-
- @Override
- public String getOldFileName() {
- return "a.txt";
- }
-
- @Override
- public String getNewFileName() {
- return "b.txt";
- }
-
- };
- }
-
public String getOldMilestone() {
return oldMilestone;
}
@@ -103,12 +72,12 @@ public class MilestoneChangeData implements ActionData {
@Override
public Map<String, User> getNewUsers(Project project) {
- return new HashMap<>();
+ return null;
}
@Override
public Map<String, Team> getNewTeams(Project project) {
- return new HashMap<>();
+ return null;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
new file mode 100644
index 0000000000..d41ffbf205
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
@@ -0,0 +1,54 @@
+package io.onedev.server.model.support.issue.changedata;
+
+import java.util.Map;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.Team;
+import io.onedev.server.model.User;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;
+
+public class IssueReferencedFromCodeCommentData implements IssueChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long commentId;
+
+ public IssueReferencedFromCodeCommentData(CodeComment comment) {
+ this.commentId = comment.getId();
+ }
+
+ public Long getCommentId() {
+ return commentId;
+ }
+
+ @Override
+ public String getDescription() {
+ return "Referenced from code comment";
+ }
+
+ @Override
+ public Component render(String componentId, IssueChange change) {
+ return new ReferencedFromCodeCommentPanel(componentId, commentId);
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+ @Override
+ public Map<String, User> getNewUsers(Project project) {
+ return null;
+ }
+
+ @Override
+ public Map<String, Team> getNewTeams(Project project) {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
new file mode 100644
index 0000000000..deb45edd05
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
@@ -0,0 +1,54 @@
+package io.onedev.server.model.support.issue.changedata;
+
+import java.util.Map;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.Team;
+import io.onedev.server.model.User;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;
+
+public class IssueReferencedFromIssueData implements IssueChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long issueId;
+
+ public IssueReferencedFromIssueData(Issue issue) {
+ this.issueId = issue.getId();
+ }
+
+ public Long getIssueId() {
+ return issueId;
+ }
+
+ @Override
+ public Component render(String componentId, IssueChange change) {
+ return new ReferencedFromIssuePanel(componentId, issueId);
+ }
+
+ @Override
+ public String getDescription() {
+ return "Referenced from other issue";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+ @Override
+ public Map<String, User> getNewUsers(Project project) {
+ return null;
+ }
+
+ @Override
+ public Map<String, Team> getNewTeams(Project project) {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
new file mode 100644
index 0000000000..68d07a88c3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
@@ -0,0 +1,54 @@
+package io.onedev.server.model.support.issue.changedata;
+
+import java.util.Map;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.Team;
+import io.onedev.server.model.User;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.web.component.pullrequest.referencedfrom.ReferencedFromPullRequestPanel;
+
+public class IssueReferencedFromPullRequestData implements IssueChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long requestId;
+
+ public IssueReferencedFromPullRequestData(PullRequest request) {
+ this.requestId = request.getId();
+ }
+
+ public Long getRequestId() {
+ return requestId;
+ }
+
+ @Override
+ public Component render(String componentId, IssueChange change) {
+ return new ReferencedFromPullRequestPanel(componentId, requestId);
+ }
+
+ @Override
+ public String getDescription() {
+ return "Referenced from pull request";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+ @Override
+ public Map<String, User> getNewUsers(Project project) {
+ return null;
+ }
+
+ @Override
+ public Map<String, Team> getNewTeams(Project project) {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
similarity index 54%
rename from core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java
rename to core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
index b68b50ccd2..7b301bf9ca 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/StateChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
@@ -7,12 +7,13 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
-import io.onedev.server.model.IssueAction;
-import io.onedev.server.model.support.CommentSupport;
-import io.onedev.server.model.support.issue.IssueField;
-import io.onedev.server.web.component.issue.activities.activity.ActionDataPanel;
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.IssueField;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.component.issue.activities.activity.DiffAndCommentAwarePanel;
-public class StateChangeData extends FieldChangeData {
+public class IssueStateChangeData extends IssueFieldChangeData {
private static final long serialVersionUID = 1L;
@@ -22,7 +23,7 @@ public class StateChangeData extends FieldChangeData {
private String comment;
- public StateChangeData(String oldState, String newState, Map<String, IssueField> oldFields,
+ public IssueStateChangeData(String oldState, String newState, Map<String, IssueField> oldFields,
Map<String, IssueField> newFields, @Nullable String comment) {
super(oldFields, newFields);
this.oldState = oldState;
@@ -39,7 +40,7 @@ public class StateChangeData extends FieldChangeData {
@Override
protected List<String> getNewLines() {
- List<String> newLines = super.getOldLines();
+ List<String> newLines = super.getNewLines();
newLines.add(0, "State: " + newState);
return newLines;
}
@@ -65,21 +66,50 @@ public class StateChangeData extends FieldChangeData {
@Override
public void setComment(String comment) {
- StateChangeData.this.comment = comment;
+ IssueStateChangeData.this.comment = comment;
}
};
}
@Override
- public Component render(String componentId, IssueAction action) {
- return new ActionDataPanel(componentId) {
+ public Component render(String componentId, IssueChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
private static final long serialVersionUID = 1L;
@Override
- protected IssueAction getAction() {
- return action;
+ protected IssueChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return new DiffSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List<String> getOldLines() {
+ return IssueStateChangeData.this.getOldLines();
+ }
+
+ @Override
+ public List<String> getNewLines() {
+ return IssueStateChangeData.this.getNewLines();
+ }
+
+ @Override
+ public String getOldFileName() {
+ return "a.txt";
+ }
+
+ @Override
+ public String getNewFileName() {
+ return "b.txt";
+ }
+
+ };
}
};
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java
similarity index 51%
rename from core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.java
rename to core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java
index e9e199fd2c..59414b1163 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/TitleChangeData.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java
@@ -1,21 +1,18 @@
package io.onedev.server.model.support.issue.changedata;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.wicket.Component;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
import io.onedev.server.model.Team;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.CommentSupport;
-import io.onedev.server.model.support.DiffSupport;
+import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
import jersey.repackaged.com.google.common.collect.Lists;
-public class TitleChangeData implements ActionData {
+public class IssueTitleChangeData implements IssueChangeData {
private static final long serialVersionUID = 1L;
@@ -23,45 +20,16 @@ public class TitleChangeData implements ActionData {
private final String newTitle;
- public TitleChangeData(String oldTitle, String newTitle) {
+ public IssueTitleChangeData(String oldTitle, String newTitle) {
this.oldTitle = oldTitle;
this.newTitle = newTitle;
}
@Override
- public Component render(String componentId, IssueAction action) {
+ public Component render(String componentId, IssueChange change) {
return new PlainDiffPanel(componentId, Lists.newArrayList(oldTitle), "a.txt", Lists.newArrayList(newTitle), "b.txt", true);
}
- @Override
- public DiffSupport getDiffSupport() {
- return new DiffSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public List<String> getOldLines() {
- return Lists.newArrayList(oldTitle);
- }
-
- @Override
- public List<String> getNewLines() {
- return Lists.newArrayList(newTitle);
- }
-
- @Override
- public String getOldFileName() {
- return "a.txt";
- }
-
- @Override
- public String getNewFileName() {
- return "b.txt";
- }
-
- };
- }
-
@Override
public String getDescription() {
return "changed title";
@@ -74,12 +42,12 @@ public class TitleChangeData implements ActionData {
@Override
public Map<String, User> getNewUsers(Project project) {
- return new HashMap<>();
+ return null;
}
@Override
public Map<String, Team> getNewTeams(Project project) {
- return new HashMap<>();
+ return null;
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java
index b02437de6b..38a2b93971 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java
@@ -11,13 +11,13 @@ import javax.validation.constraints.Size;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.support.issue.IssueField;
import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.BuildSuccessfulTrigger;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.TransitionTrigger;
import io.onedev.server.model.support.usermatcher.SpecifiedTeam;
import io.onedev.server.model.support.usermatcher.SpecifiedUser;
+import io.onedev.server.util.IssueField;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ActionData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ActionData.java
deleted file mode 100644
index ddb66c55e6..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ActionData.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import java.io.Serializable;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-
-import io.onedev.server.model.PullRequestAction;
-import io.onedev.server.model.support.CommentSupport;
-import io.onedev.server.model.support.DiffSupport;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.ActionDataPanel;
-
-public abstract class ActionData implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public Component render(String componentId, PullRequestAction action) {
- return new ActionDataPanel(componentId) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected PullRequestAction getAction() {
- return action;
- }
-
- };
- }
-
- public abstract String getDescription();
-
- @Nullable
- public CommentSupport getCommentSupport() {
- return null;
- }
-
- @Nullable
- public DiffSupport getDiffSupport() {
- return null;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/AddedReviewerData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/AddedReviewerData.java
deleted file mode 100644
index eb43fd4126..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/AddedReviewerData.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-public class AddedReviewerData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private final String reviewer;
-
- public AddedReviewerData(String reviewer) {
- this.reviewer = reviewer;
- }
-
- @Override
- public String getDescription() {
- return "added reviewer \"" + reviewer + "\"";
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ApprovedData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ApprovedData.java
deleted file mode 100644
index f22125d291..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ApprovedData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.model.support.CommentSupport;
-
-public class ApprovedData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private String comment;
-
- public ApprovedData(@Nullable String comment) {
- this.comment = comment;
- }
-
- @Override
- public String getDescription() {
- return "approved";
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- return new CommentSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getComment() {
- return comment;
- }
-
- @Override
- public void setComment(String comment) {
- ApprovedData.this.comment = comment;
- }
-
- };
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ChangedMergeStrategyData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ChangedMergeStrategyData.java
deleted file mode 100644
index 8f7986341a..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ChangedMergeStrategyData.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.server.model.support.DiffSupport;
-import io.onedev.server.model.support.pullrequest.MergeStrategy;
-
-public class ChangedMergeStrategyData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private final MergeStrategy oldStrategy;
-
- private final MergeStrategy newStrategy;
-
- public ChangedMergeStrategyData(MergeStrategy oldStrategy, MergeStrategy newStrategy) {
- this.oldStrategy = oldStrategy;
- this.newStrategy = newStrategy;
- }
-
- @Override
- public String getDescription() {
- return "changed merge strategy";
- }
-
- @Override
- public DiffSupport getDiffSupport() {
- return new DiffSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public List<String> getOldLines() {
- return Lists.newArrayList(oldStrategy.toString());
- }
-
- @Override
- public List<String> getNewLines() {
- return Lists.newArrayList(newStrategy.toString());
- }
-
- @Override
- public String getOldFileName() {
- return null;
- }
-
- @Override
- public String getNewFileName() {
- return null;
- }
-
- };
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ChangedTitleData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ChangedTitleData.java
deleted file mode 100644
index 88dc63ab42..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ChangedTitleData.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.server.model.support.DiffSupport;
-
-public class ChangedTitleData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private final String oldTitle;
-
- private final String newTitle;
-
- public ChangedTitleData(String oldTitle, String newTitle) {
- this.oldTitle = oldTitle;
- this.newTitle = newTitle;
- }
-
- @Override
- public String getDescription() {
- return "changed title";
- }
-
- @Override
- public DiffSupport getDiffSupport() {
- return new DiffSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public List<String> getOldLines() {
- return Lists.newArrayList(oldTitle);
- }
-
- @Override
- public List<String> getNewLines() {
- return Lists.newArrayList(newTitle);
- }
-
- @Override
- public String getOldFileName() {
- return "a.txt";
- }
-
- @Override
- public String getNewFileName() {
- return "b.txt";
- }
-
- };
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/DeletedSourceBranchData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/DeletedSourceBranchData.java
deleted file mode 100644
index a208b0bcdd..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/DeletedSourceBranchData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.model.support.CommentSupport;
-
-public class DeletedSourceBranchData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private String comment;
-
- public DeletedSourceBranchData(@Nullable String comment) {
- this.comment = comment;
- }
-
- @Override
- public String getDescription() {
- return "deleted source branch";
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- return new CommentSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getComment() {
- return comment;
- }
-
- @Override
- public void setComment(String comment) {
- DeletedSourceBranchData.this.comment = comment;
- }
-
- };
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/DiscardedData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/DiscardedData.java
deleted file mode 100644
index 3e52912664..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/DiscardedData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.model.support.CommentSupport;
-
-public class DiscardedData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private String comment;
-
- public DiscardedData(@Nullable String comment) {
- this.comment = comment;
- }
-
- @Override
- public String getDescription() {
- return "discarded pull request";
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- return new CommentSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getComment() {
- return comment;
- }
-
- @Override
- public void setComment(String comment) {
- DiscardedData.this.comment = comment;
- }
-
- };
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/MergedData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/MergedData.java
deleted file mode 100644
index fd595670d1..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/MergedData.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import javax.annotation.Nullable;
-
-public class MergedData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private final String reason;
-
- public MergedData(@Nullable String reason) {
- this.reason = reason;
- }
-
- @Override
- public String getDescription() {
- if (reason != null)
- return reason;
- else
- return "merged pull request";
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/RemovedReviewerData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/RemovedReviewerData.java
deleted file mode 100644
index 62f0898a93..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/RemovedReviewerData.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import io.onedev.server.model.support.CommentSupport;
-
-public class RemovedReviewerData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private final String reviewer;
-
- public RemovedReviewerData(String reviewer) {
- this.reviewer = reviewer;
- }
-
- @Override
- public String getDescription() {
- return "removed reviewer \"" + reviewer + "\"";
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- return null;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ReopenedData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ReopenedData.java
deleted file mode 100644
index 800b709020..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ReopenedData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.model.support.CommentSupport;
-
-public class ReopenedData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private String comment;
-
- public ReopenedData(@Nullable String comment) {
- this.comment = comment;
- }
-
- @Override
- public String getDescription() {
- return "reopened pull request";
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- return new CommentSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getComment() {
- return comment;
- }
-
- @Override
- public void setComment(String comment) {
- ReopenedData.this.comment = comment;
- }
-
- };
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/RequestedForChangesData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/RequestedForChangesData.java
deleted file mode 100644
index a9d22ff2fa..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/RequestedForChangesData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.model.support.CommentSupport;
-
-public class RequestedForChangesData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private String comment;
-
- public RequestedForChangesData(@Nullable String comment) {
- this.comment = comment;
- }
-
- @Override
- public String getDescription() {
- return "requested for changes";
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- return new CommentSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getComment() {
- return comment;
- }
-
- @Override
- public void setComment(String comment) {
- RequestedForChangesData.this.comment = comment;
- }
-
- };
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/RestoredSourceBranchData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/RestoredSourceBranchData.java
deleted file mode 100644
index b9229f63de..0000000000
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/RestoredSourceBranchData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.onedev.server.model.support.pullrequest.actiondata;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.model.support.CommentSupport;
-
-public class RestoredSourceBranchData extends ActionData {
-
- private static final long serialVersionUID = 1L;
-
- private String comment;
-
- public RestoredSourceBranchData(@Nullable String comment) {
- this.comment = comment;
- }
-
- @Override
- public String getDescription() {
- return "restored source branch";
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- return new CommentSupport() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getComment() {
- return comment;
- }
-
- @Override
- public void setComment(String comment) {
- RestoredSourceBranchData.this.comment = comment;
- }
-
- };
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java
new file mode 100644
index 0000000000..897ef2a7e9
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java
@@ -0,0 +1,64 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestApproveData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private String comment;
+
+ public PullRequestApproveData(@Nullable String comment) {
+ this.comment = comment;
+ }
+
+ @Override
+ public String getDescription() {
+ return "approved";
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return null;
+ }
+ };
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return new CommentSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getComment() {
+ return comment;
+ }
+
+ @Override
+ public void setComment(String comment) {
+ PullRequestApproveData.this.comment = comment;
+ }
+
+ };
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java
new file mode 100644
index 0000000000..b0d712a2e2
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java
@@ -0,0 +1,21 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import java.io.Serializable;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+
+public interface PullRequestChangeData extends Serializable {
+
+ abstract Component render(String componentId, PullRequestChange change);
+
+ abstract String getDescription();
+
+ @Nullable
+ abstract CommentSupport getCommentSupport();
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
new file mode 100644
index 0000000000..c129259857
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
@@ -0,0 +1,42 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import java.util.List;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
+import io.onedev.utils.StringUtils;
+
+public class PullRequestDescriptionChangeData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String oldDescription;
+
+ private final String newDescription;
+
+ public PullRequestDescriptionChangeData(String oldDescription, String newDescription) {
+ this.oldDescription = oldDescription;
+ this.newDescription = newDescription;
+ }
+
+ @Override
+ public String getDescription() {
+ return "changed description";
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ List<String> oldLines = StringUtils.splitAndTrim(oldDescription, "\n");
+ List<String> newLines = StringUtils.splitAndTrim(newDescription, "\n");
+ return new PlainDiffPanel(componentId, oldLines, "a.txt", newLines, "b.txt", true);
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java
new file mode 100644
index 0000000000..2fe8c06aeb
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java
@@ -0,0 +1,64 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestDiscardData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private String comment;
+
+ public PullRequestDiscardData(@Nullable String comment) {
+ this.comment = comment;
+ }
+
+ @Override
+ public String getDescription() {
+ return "discarded pull request";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return new CommentSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getComment() {
+ return comment;
+ }
+
+ @Override
+ public void setComment(String comment) {
+ PullRequestDiscardData.this.comment = comment;
+ }
+
+ };
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return null;
+ }
+ };
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java
new file mode 100644
index 0000000000..fba3820152
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java
@@ -0,0 +1,54 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestMergeData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String reason;
+
+ public PullRequestMergeData(@Nullable String reason) {
+ this.reason = reason;
+ }
+
+ @Override
+ public String getDescription() {
+ if (reason != null)
+ return reason;
+ else
+ return "Pull request was merged";
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return null;
+ }
+ };
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
new file mode 100644
index 0000000000..54c31a8233
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
@@ -0,0 +1,80 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import java.util.List;
+
+import org.apache.wicket.Component;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.support.pullrequest.MergeStrategy;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestMergeStrategyChangeData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final MergeStrategy oldStrategy;
+
+ private final MergeStrategy newStrategy;
+
+ public PullRequestMergeStrategyChangeData(MergeStrategy oldStrategy, MergeStrategy newStrategy) {
+ this.oldStrategy = oldStrategy;
+ this.newStrategy = newStrategy;
+ }
+
+ @Override
+ public String getDescription() {
+ return "changed merge strategy";
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return new DiffSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List<String> getOldLines() {
+ return Lists.newArrayList(oldStrategy.toString());
+ }
+
+ @Override
+ public List<String> getNewLines() {
+ return Lists.newArrayList(newStrategy.toString());
+ }
+
+ @Override
+ public String getOldFileName() {
+ return null;
+ }
+
+ @Override
+ public String getNewFileName() {
+ return null;
+ }
+
+ };
+ }
+ };
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java
new file mode 100644
index 0000000000..696b0eb919
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java
@@ -0,0 +1,39 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;
+
+public class PullRequestReferencedFromCodeCommentData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long commentId;
+
+ public PullRequestReferencedFromCodeCommentData(CodeComment comment) {
+ this.commentId = comment.getId();
+ }
+
+ public Long getCommentId() {
+ return commentId;
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new ReferencedFromCodeCommentPanel(componentId, commentId);
+ }
+
+ @Override
+ public String getDescription() {
+ return "referenced from code comment";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java
new file mode 100644
index 0000000000..24b66f1bd2
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java
@@ -0,0 +1,40 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;
+
+public class PullRequestReferencedFromIssueData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long issueId;
+
+ public PullRequestReferencedFromIssueData(Issue issue) {
+ this.issueId = issue.getId();
+ }
+
+ public Long getIssueId() {
+ return issueId;
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new ReferencedFromIssuePanel(componentId, issueId);
+ }
+
+ @Override
+ public String getDescription() {
+ return "referenced from issue";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java
new file mode 100644
index 0000000000..46e1243748
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java
@@ -0,0 +1,39 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.web.component.pullrequest.referencedfrom.ReferencedFromPullRequestPanel;
+
+public class PullRequestReferencedFromPullRequestData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long requestId;
+
+ public PullRequestReferencedFromPullRequestData(PullRequest request) {
+ this.requestId = request.getId();
+ }
+
+ public Long getRequestId() {
+ return requestId;
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new ReferencedFromPullRequestPanel(componentId, requestId);
+ }
+
+ @Override
+ public String getDescription() {
+ return "referenced from other pull request";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java
new file mode 100644
index 0000000000..96afeb6de1
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java
@@ -0,0 +1,65 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestReopenData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private String comment;
+
+ public PullRequestReopenData(@Nullable String comment) {
+ this.comment = comment;
+ }
+
+ @Override
+ public String getDescription() {
+ return "reopened pull request";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return new CommentSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getComment() {
+ return comment;
+ }
+
+ @Override
+ public void setComment(String comment) {
+ PullRequestReopenData.this.comment = comment;
+ }
+
+ };
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return null;
+ }
+
+ };
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java
new file mode 100644
index 0000000000..b73fb93dea
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java
@@ -0,0 +1,64 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestRequestedForChangesData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private String comment;
+
+ public PullRequestRequestedForChangesData(@Nullable String comment) {
+ this.comment = comment;
+ }
+
+ @Override
+ public String getDescription() {
+ return "requested for changes";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return new CommentSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getComment() {
+ return comment;
+ }
+
+ @Override
+ public void setComment(String comment) {
+ PullRequestRequestedForChangesData.this.comment = comment;
+ }
+
+ };
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return null;
+ }
+ };
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java
new file mode 100644
index 0000000000..989d4ccadb
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java
@@ -0,0 +1,49 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestReviewerAddData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String reviewer;
+
+ public PullRequestReviewerAddData(String reviewer) {
+ this.reviewer = reviewer;
+ }
+
+ @Override
+ public String getDescription() {
+ return "added reviewer \"" + reviewer + "\"";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return null;
+ }
+
+ };
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java
new file mode 100644
index 0000000000..447c815bb7
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java
@@ -0,0 +1,49 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestReviewerRemoveData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String reviewer;
+
+ public PullRequestReviewerRemoveData(String reviewer) {
+ this.reviewer = reviewer;
+ }
+
+ @Override
+ public String getDescription() {
+ return "removed reviewer \"" + reviewer + "\"";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return null;
+ }
+
+ };
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java
new file mode 100644
index 0000000000..e41365fab2
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java
@@ -0,0 +1,64 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestSourceBranchDeleteData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private String comment;
+
+ public PullRequestSourceBranchDeleteData(@Nullable String comment) {
+ this.comment = comment;
+ }
+
+ @Override
+ public String getDescription() {
+ return "deleted source branch";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return new CommentSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getComment() {
+ return comment;
+ }
+
+ @Override
+ public void setComment(String comment) {
+ PullRequestSourceBranchDeleteData.this.comment = comment;
+ }
+
+ };
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return null;
+ }
+ };
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java
new file mode 100644
index 0000000000..4b9576ebc5
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java
@@ -0,0 +1,65 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestSourceBranchRestoreData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private String comment;
+
+ public PullRequestSourceBranchRestoreData(@Nullable String comment) {
+ this.comment = comment;
+ }
+
+ @Override
+ public String getDescription() {
+ return "restored source branch";
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return new CommentSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getComment() {
+ return comment;
+ }
+
+ @Override
+ public void setComment(String comment) {
+ PullRequestSourceBranchRestoreData.this.comment = comment;
+ }
+
+ };
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return null;
+ }
+
+ };
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
new file mode 100644
index 0000000000..4dba3b6995
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
@@ -0,0 +1,79 @@
+package io.onedev.server.model.support.pullrequest.changedata;
+
+import java.util.List;
+
+import org.apache.wicket.Component;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.util.CommentSupport;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.DiffAndCommentAwarePanel;
+
+public class PullRequestTitleChangeData implements PullRequestChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String oldTitle;
+
+ private final String newTitle;
+
+ public PullRequestTitleChangeData(String oldTitle, String newTitle) {
+ this.oldTitle = oldTitle;
+ this.newTitle = newTitle;
+ }
+
+ @Override
+ public String getDescription() {
+ return "changed title";
+ }
+
+ @Override
+ public Component render(String componentId, PullRequestChange change) {
+ return new DiffAndCommentAwarePanel(componentId) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected PullRequestChange getChange() {
+ return change;
+ }
+
+ @Override
+ protected DiffSupport getDiffSupport() {
+ return new DiffSupport() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List<String> getOldLines() {
+ return Lists.newArrayList(oldTitle);
+ }
+
+ @Override
+ public List<String> getNewLines() {
+ return Lists.newArrayList(newTitle);
+ }
+
+ @Override
+ public String getOldFileName() {
+ return "a.txt";
+ }
+
+ @Override
+ public String getNewFileName() {
+ return "b.txt";
+ }
+
+ };
+ }
+ };
+ }
+
+ @Override
+ public CommentSupport getCommentSupport() {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildDateCriteria.java
index 8990a6a1b0..0af9a4b681 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildDateCriteria.java
@@ -8,10 +8,10 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.util.BuildConstants;
public class BuildDateCriteria extends EntityCriteria<Build> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index 5a03d90901..5a2d1776e5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -1,9 +1,9 @@
package io.onedev.server.search.entity.build;
-import static io.onedev.server.model.support.build.BuildConstants.FIELD_BUILD_DATE;
-import static io.onedev.server.model.support.build.BuildConstants.FIELD_COMMIT;
-import static io.onedev.server.model.support.build.BuildConstants.FIELD_CONFIGURATION;
-import static io.onedev.server.model.support.build.BuildConstants.FIELD_VERSION;
+import static io.onedev.server.util.BuildConstants.FIELD_BUILD_DATE;
+import static io.onedev.server.util.BuildConstants.FIELD_COMMIT;
+import static io.onedev.server.util.BuildConstants.FIELD_CONFIGURATION;
+import static io.onedev.server.util.BuildConstants.FIELD_VERSION;
import java.util.ArrayList;
import java.util.Date;
@@ -21,7 +21,6 @@ import org.antlr.v4.runtime.Recognizer;
import io.onedev.server.exception.OneException;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.AndCriteriaHelper;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -39,6 +38,7 @@ import io.onedev.server.search.entity.build.BuildQueryParser.OrCriteriaContext;
import io.onedev.server.search.entity.build.BuildQueryParser.OrderContext;
import io.onedev.server.search.entity.build.BuildQueryParser.ParensCriteriaContext;
import io.onedev.server.search.entity.build.BuildQueryParser.QueryContext;
+import io.onedev.server.util.BuildConstants;
public class BuildQuery extends EntityQuery<Build> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
index 26da662f69..7b110b1c05 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/CommitCriteria.java
@@ -8,9 +8,9 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
public class CommitCriteria extends EntityCriteria<Build> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/ConfigurationCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/ConfigurationCriteria.java
index 507b7a2c8b..be0696bfde 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/ConfigurationCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/ConfigurationCriteria.java
@@ -7,9 +7,9 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Configuration;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
public class ConfigurationCriteria extends EntityCriteria<Build> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
index 84f57cae94..11029ccc6f 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
@@ -6,9 +6,9 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
public class FailedCriteria extends EntityCriteria<Build> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
index 40e6616540..502cb8005c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java
@@ -16,9 +16,9 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
public class FixedIssueCriteria extends EntityCriteria<Build> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java
index cceb0afd29..110b1158e2 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/InErrorCriteria.java
@@ -6,9 +6,9 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
public class InErrorCriteria extends EntityCriteria<Build> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
index 1b8604fdc7..efbe987400 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
@@ -6,9 +6,9 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
public class RunningCriteria extends EntityCriteria<Build> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
index a16c5f6c05..77345d612d 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
@@ -6,9 +6,9 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
public class SuccessfulCriteria extends EntityCriteria<Build> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
index fb5eb6cc26..9e9b51e7e4 100644
--- a/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/build/VersionCriteria.java
@@ -6,9 +6,9 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.BuildConstants;
public class VersionCriteria extends EntityCriteria<Build> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index 6c6f31c354..bc069ce9be 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -1,11 +1,11 @@
package io.onedev.server.search.entity.codecomment;
-import static io.onedev.server.model.support.codecomment.CodeCommentConstants.FIELD_CONTENT;
-import static io.onedev.server.model.support.codecomment.CodeCommentConstants.FIELD_CREATE_DATE;
-import static io.onedev.server.model.support.codecomment.CodeCommentConstants.FIELD_PATH;
-import static io.onedev.server.model.support.codecomment.CodeCommentConstants.FIELD_REPLY;
-import static io.onedev.server.model.support.codecomment.CodeCommentConstants.FIELD_REPLY_COUNT;
-import static io.onedev.server.model.support.codecomment.CodeCommentConstants.FIELD_UPDATE_DATE;
+import static io.onedev.server.util.CodeCommentConstants.FIELD_CONTENT;
+import static io.onedev.server.util.CodeCommentConstants.FIELD_CREATE_DATE;
+import static io.onedev.server.util.CodeCommentConstants.FIELD_PATH;
+import static io.onedev.server.util.CodeCommentConstants.FIELD_REPLY;
+import static io.onedev.server.util.CodeCommentConstants.FIELD_REPLY_COUNT;
+import static io.onedev.server.util.CodeCommentConstants.FIELD_UPDATE_DATE;
import java.util.ArrayList;
import java.util.Date;
@@ -23,7 +23,6 @@ import org.antlr.v4.runtime.Recognizer;
import io.onedev.server.exception.OneException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.AndCriteriaHelper;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -41,6 +40,7 @@ import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrCrite
import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrderContext;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.ParensCriteriaContext;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.QueryContext;
+import io.onedev.server.util.CodeCommentConstants;
public class CodeCommentQuery extends EntityQuery<CodeComment> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
index 81bc047fdc..bd333ff823 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/ContentCriteria.java
@@ -6,10 +6,10 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.util.CodeCommentConstants;
public class ContentCriteria extends EntityCriteria<CodeComment> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
index a57c01b2b1..ab3349ba75 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreateDateCriteria.java
@@ -6,10 +6,10 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
@@ -41,9 +41,9 @@ public class CreateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public boolean matches(CodeComment comment, User user) {
if (operator == CodeCommentQueryLexer.IsBefore)
- return comment.getDate().before(value);
+ return comment.getCreateDate().before(value);
else
- return comment.getDate().after(value);
+ return comment.getCreateDate().after(value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
index 91729b064d..2be8dd5875 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
@@ -6,10 +6,10 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
index 806cbcafb8..c71c9d79ac 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
@@ -8,9 +8,9 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.CodeCommentConstants;
public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
index 86464a121c..2fb647c593 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/OnCommitCriteria.java
@@ -6,10 +6,10 @@ import javax.persistence.criteria.Predicate;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index be317e3b7f..41b953a1cd 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
@@ -4,10 +4,10 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.utils.stringmatch.WildcardUtils;
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
index 27300ab404..87ac06d4fa 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCountCriteria.java
@@ -4,10 +4,10 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
index dbc9c1bd3e..fbba90ddb4 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/ReplyCriteria.java
@@ -5,11 +5,11 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
diff --git a/core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
index 8f66ff9a6a..c2cb369ca2 100644
--- a/core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
@@ -6,10 +6,10 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
+import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
@@ -41,9 +41,9 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public boolean matches(CodeComment comment, User user) {
if (operator == CodeCommentQueryLexer.IsBefore)
- return comment.getLastActivity().getDate().before(value);
+ return comment.getUpdateDate().before(value);
else
- return comment.getLastActivity().getDate().after(value);
+ return comment.getUpdateDate().after(value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
index c0fec074f9..4b1b2e2dc6 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCountCriteria.java
@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class CommentCountCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
index 8c49242929..1966d2d67b 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
@@ -8,8 +8,8 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class CommentCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
index b08b7672ab..8d125d4963 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/DescriptionCriteria.java
@@ -7,8 +7,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class DescriptionCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
index 4635450b13..62e057e155 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
import java.util.Set;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.IssueConstants;
+import io.onedev.server.util.IssueConstants;
public abstract class FieldCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
index 3521b3cec3..88cbff0590 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
@@ -21,8 +21,8 @@ import io.onedev.server.manager.CacheManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.IssueUtils;
public class FixedBetweenCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java
index 82d08f8fd6..05a9ec3c72 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java
@@ -8,8 +8,8 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class FixedInCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index f021f71169..ea97af1b3d 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -1,16 +1,16 @@
package io.onedev.server.search.entity.issue;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_COMMENT;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_COMMENT_COUNT;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_DESCRIPTION;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_MILESTONE;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_NUMBER;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_STATE;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_SUBMITTER;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_SUBMIT_DATE;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_TITLE;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_UPDATE_DATE;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_VOTE_COUNT;
+import static io.onedev.server.util.IssueConstants.FIELD_COMMENT;
+import static io.onedev.server.util.IssueConstants.FIELD_COMMENT_COUNT;
+import static io.onedev.server.util.IssueConstants.FIELD_DESCRIPTION;
+import static io.onedev.server.util.IssueConstants.FIELD_MILESTONE;
+import static io.onedev.server.util.IssueConstants.FIELD_NUMBER;
+import static io.onedev.server.util.IssueConstants.FIELD_STATE;
+import static io.onedev.server.util.IssueConstants.FIELD_SUBMITTER;
+import static io.onedev.server.util.IssueConstants.FIELD_SUBMIT_DATE;
+import static io.onedev.server.util.IssueConstants.FIELD_TITLE;
+import static io.onedev.server.util.IssueConstants.FIELD_UPDATE_DATE;
+import static io.onedev.server.util.IssueConstants.FIELD_VOTE_COUNT;
import java.io.IOException;
import java.util.ArrayList;
@@ -36,7 +36,6 @@ import io.onedev.server.exception.OneException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
@@ -54,6 +53,7 @@ import io.onedev.server.search.entity.issue.IssueQueryParser.ParensCriteriaConte
import io.onedev.server.search.entity.issue.IssueQueryParser.QueryContext;
import io.onedev.server.search.entity.issue.IssueQueryParser.RevisionCriteriaContext;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.BuildChoiceInput;
import io.onedev.server.util.inputspec.InputContext;
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
index acd0f35aed..55c983c686 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java
@@ -6,8 +6,8 @@ import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.model.IssueFieldUnary;
public class IssueQueryBuildContext extends QueryBuildContext<Issue> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
index 983da74692..a344c4b889 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/MilestoneCriteria.java
@@ -10,8 +10,8 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class MilestoneCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
index 72b1b686c7..4f343a100b 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NumberCriteria.java
@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class NumberCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
index de2db0bd0f..c334f89bd6 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
@@ -11,8 +11,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class StateCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
index 13928d75c4..38734a99b8 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class SubmitDateCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
index 886f4866f8..046d031e56 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class SubmittedByCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
index 8edcb4d9ea..e7a1184cd5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class SubmittedByMeCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
index 3b9bd1752f..3c45e865c7 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/TitleCriteria.java
@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class TitleCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
index 7cf7585472..d476985790 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class UpdateDateCriteria extends IssueCriteria {
@@ -39,9 +39,9 @@ public class UpdateDateCriteria extends IssueCriteria {
@Override
public boolean matches(Issue issue, User user) {
if (operator == IssueQueryLexer.IsBefore)
- return issue.getLastActivity().getDate().before(value);
+ return issue.getUpdateDate().before(value);
else
- return issue.getLastActivity().getDate().after(value);
+ return issue.getUpdateDate().after(value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
index 5d399e9fea..3d8609f6d4 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/VoteCountCriteria.java
@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.IssueConstants;
public class VoteCountCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
index 85d76fc790..50b9f7e18f 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
@@ -8,9 +8,9 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class ApprovedByCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
index 405570356d..e914e9e692 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
@@ -8,9 +8,9 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class ApprovedByMeCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
index c29411315f..449d931668 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CloseDateCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class CloseDateCriteria extends PullRequestCriteria {
@@ -38,10 +38,14 @@ public class CloseDateCriteria extends PullRequestCriteria {
@Override
public boolean matches(PullRequest request, User user) {
- if (operator == PullRequestQueryLexer.IsBefore)
- return request.getLastActivity().getDate().before(value);
- else
- return request.getLastActivity().getDate().after(value);
+ if (request.getCloseInfo() != null) {
+ if (operator == PullRequestQueryLexer.IsBefore)
+ return request.getCloseInfo().getDate().before(value);
+ else
+ return request.getCloseInfo().getDate().after(value);
+ } else {
+ return false;
+ }
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
index 33c9420d37..b7a146dbd6 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class CommentCountCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
index 2f6687f05e..bd3b51608b 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
@@ -10,9 +10,9 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.CodeCommentConstants;
+import io.onedev.server.util.PullRequestConstants;
public class CommentCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
index 9efb8f2ba8..61d611582e 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DescriptionCriteria.java
@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class DescriptionCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
index 14963d35d6..8321865855 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class DiscardedByCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
index a7799abcc5..33d77ae661 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedByMeCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class DiscardedByMeCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
index d8d7c4ea37..647f383561 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasFailedBuildsCriteria.java
@@ -9,8 +9,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestBuild;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class HasFailedBuildsCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
index 900546948a..e444a97226 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java
@@ -7,8 +7,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.MergePreview;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class HasMergeConflictsCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java
index 3e8801840c..02fdc2aca5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingBuildsCriteria.java
@@ -9,8 +9,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestBuild;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class HasPendingBuildsCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
index a3ccc6eb75..5c63259e47 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
@@ -8,9 +8,9 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class HasPendingReviewsCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
index 423bfc18ac..90738cf7be 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java
@@ -11,8 +11,8 @@ import io.onedev.server.manager.CodeCommentRelationInfoManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class IncludesCommitCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
index 0330090104..991923da7d 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java
@@ -14,8 +14,8 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class IncludesIssueCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
index 6882707bd8..180bbb99a2 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/MergeStrategyCriteria.java
@@ -7,8 +7,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class MergeStrategyCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
index 074d220246..5ba3fa2f7d 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/NumberCriteria.java
@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class NumberCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
index 04fd2e679c..6d7d4a941b 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
@@ -5,8 +5,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class OpenCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index 4d55c8e18d..13c73a012a 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -19,7 +19,6 @@ import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
@@ -33,6 +32,7 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OrCrite
import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OrderContext;
import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ParensCriteriaContext;
import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.QueryContext;
+import io.onedev.server.util.PullRequestConstants;
public class PullRequestQuery extends EntityQuery<PullRequest> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java
index 465a1618d1..e38636a653 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java
@@ -8,9 +8,9 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class RequestForChangesByCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java
index 7e63b842a3..a200876bf2 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java
@@ -8,9 +8,9 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class RequestForChangesByMeCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
index b7158267e6..0fb3f74b77 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
@@ -8,9 +8,9 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class SomeoneRequestedForChangesCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
index aed67cf58d..c7220857f6 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceBranchCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class SourceBranchCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
index ed56d50c29..6c68b8f635 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SourceProjectCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class SourceProjectCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
index 13fa8b2c35..2b6d91e8ce 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
@@ -7,8 +7,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class StatusCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
index 199db0b81f..d4203379f5 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmitDateCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class SubmitDateCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
index 70e1713cc3..3cac0376f6 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class SubmittedByCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
index 96f127e5ec..ebda582007 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class SubmittedByMeCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
index bfef12a9be..135ee11d40 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TargetBranchCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class TargetBranchCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
index 8c7772164d..3f05659359 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/TitleCriteria.java
@@ -6,8 +6,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class TitleCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
index 134eb50673..7c85feb0f4 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
@@ -8,9 +8,9 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class ToBeReviewedByCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
index c1973cea8a..807b0555ed 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
@@ -8,9 +8,9 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class ToBeReviewedByMeCriteria extends PullRequestCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
index 6f43ee3d46..1c39733f66 100644
--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.PullRequestConstants;
public class UpdateDateCriteria extends PullRequestCriteria {
@@ -39,9 +39,9 @@ public class UpdateDateCriteria extends PullRequestCriteria {
@Override
public boolean matches(PullRequest request, User user) {
if (operator == PullRequestQueryLexer.IsBefore)
- return request.getLastActivity().getDate().before(value);
+ return request.getUpdateDate().before(value);
else
- return request.getLastActivity().getDate().after(value);
+ return request.getUpdateDate().after(value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/security/SecurityUtils.java b/core/src/main/java/io/onedev/server/security/SecurityUtils.java
index c4f34596ef..407b075238 100644
--- a/core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -15,11 +15,11 @@ import io.onedev.server.manager.UserManager;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestAction;
+import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.User;
import io.onedev.server.model.support.BranchProtection;
@@ -163,16 +163,16 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
|| canWriteCode(comment.getIssue().getProject().getFacade());
}
- public static boolean canModifyOrDelete(PullRequestAction action) {
+ public static boolean canModifyOrDelete(PullRequestChange change) {
User user = SecurityUtils.getUser();
- return user != null && user.equals(action.getUser())
- || canWriteCode(action.getRequest().getTargetProject().getFacade());
+ return user != null && user.equals(change.getUser())
+ || canWriteCode(change.getRequest().getTargetProject().getFacade());
}
- public static boolean canModifyOrDelete(IssueAction action) {
+ public static boolean canModifyOrDelete(IssueChange change) {
User user = SecurityUtils.getUser();
- return user != null && user.equals(action.getUser())
- || canWriteCode(action.getIssue().getProject().getFacade());
+ return user != null && user.equals(change.getUser())
+ || canWriteCode(change.getIssue().getProject().getFacade());
}
public static boolean canModify(PullRequest request) {
diff --git a/core/src/main/java/io/onedev/server/model/support/build/BuildConstants.java b/core/src/main/java/io/onedev/server/util/BuildConstants.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/model/support/build/BuildConstants.java
rename to core/src/main/java/io/onedev/server/util/BuildConstants.java
index 3381110de9..fd427940fe 100644
--- a/core/src/main/java/io/onedev/server/model/support/build/BuildConstants.java
+++ b/core/src/main/java/io/onedev/server/util/BuildConstants.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.build;
+package io.onedev.server.util;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/model/support/codecomment/CodeCommentConstants.java b/core/src/main/java/io/onedev/server/util/CodeCommentConstants.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/model/support/codecomment/CodeCommentConstants.java
rename to core/src/main/java/io/onedev/server/util/CodeCommentConstants.java
index 8a820ad7e7..997ad97fde 100644
--- a/core/src/main/java/io/onedev/server/model/support/codecomment/CodeCommentConstants.java
+++ b/core/src/main/java/io/onedev/server/util/CodeCommentConstants.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.codecomment;
+package io.onedev.server.util;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/model/support/CommentSupport.java b/core/src/main/java/io/onedev/server/util/CommentSupport.java
similarity index 78%
rename from core/src/main/java/io/onedev/server/model/support/CommentSupport.java
rename to core/src/main/java/io/onedev/server/util/CommentSupport.java
index df603312f1..7d08eda88b 100644
--- a/core/src/main/java/io/onedev/server/model/support/CommentSupport.java
+++ b/core/src/main/java/io/onedev/server/util/CommentSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support;
+package io.onedev.server.util;
import java.io.Serializable;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueConstants.java b/core/src/main/java/io/onedev/server/util/IssueConstants.java
similarity index 98%
rename from core/src/main/java/io/onedev/server/model/support/issue/IssueConstants.java
rename to core/src/main/java/io/onedev/server/util/IssueConstants.java
index e95369f2dc..1c66872eb1 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueConstants.java
+++ b/core/src/main/java/io/onedev/server/util/IssueConstants.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue;
+package io.onedev.server.util;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueField.java b/core/src/main/java/io/onedev/server/util/IssueField.java
similarity index 97%
rename from core/src/main/java/io/onedev/server/model/support/issue/IssueField.java
rename to core/src/main/java/io/onedev/server/util/IssueField.java
index cbe6d448f6..eba4f0708e 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueField.java
+++ b/core/src/main/java/io/onedev/server/util/IssueField.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue;
+package io.onedev.server.util;
import java.io.Serializable;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/PullRequestConstants.java b/core/src/main/java/io/onedev/server/util/PullRequestConstants.java
similarity index 98%
rename from core/src/main/java/io/onedev/server/model/support/pullrequest/PullRequestConstants.java
rename to core/src/main/java/io/onedev/server/util/PullRequestConstants.java
index c799a292b8..c5fd31c7b3 100644
--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/PullRequestConstants.java
+++ b/core/src/main/java/io/onedev/server/util/PullRequestConstants.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.pullrequest;
+package io.onedev.server.util;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/model/support/Referenceable.java b/core/src/main/java/io/onedev/server/util/Referenceable.java
similarity index 57%
rename from core/src/main/java/io/onedev/server/model/support/Referenceable.java
rename to core/src/main/java/io/onedev/server/util/Referenceable.java
index 597cfcacb6..2f517e5052 100644
--- a/core/src/main/java/io/onedev/server/model/support/Referenceable.java
+++ b/core/src/main/java/io/onedev/server/util/Referenceable.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support;
+package io.onedev.server.util;
public interface Referenceable {
long getNumber();
diff --git a/core/src/main/java/io/onedev/server/model/support/DiffSupport.java b/core/src/main/java/io/onedev/server/util/diff/DiffSupport.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/model/support/DiffSupport.java
rename to core/src/main/java/io/onedev/server/util/diff/DiffSupport.java
index ca83348f65..c373d96b58 100644
--- a/core/src/main/java/io/onedev/server/model/support/DiffSupport.java
+++ b/core/src/main/java/io/onedev/server/util/diff/DiffSupport.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support;
+package io.onedev.server.util.diff;
import java.io.Serializable;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java b/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
index ed8cd172b1..83c6232730 100644
--- a/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
+++ b/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
@@ -17,8 +17,8 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.Referenceable;
import io.onedev.server.util.JsoupUtils;
+import io.onedev.server.util.Referenceable;
import io.onedev.server.util.TextNodeVisitor;
import io.onedev.utils.ReflectionUtils;
import io.onedev.utils.StringUtils;
diff --git a/core/src/main/java/io/onedev/server/model/support/QuerySubscriptionSupport.java b/core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.java
similarity index 73%
rename from core/src/main/java/io/onedev/server/model/support/QuerySubscriptionSupport.java
rename to core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.java
index 1f024d43ce..d742f6440b 100644
--- a/core/src/main/java/io/onedev/server/model/support/QuerySubscriptionSupport.java
+++ b/core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.java
@@ -1,7 +1,9 @@
-package io.onedev.server.model.support;
+package io.onedev.server.util.watch;
import java.util.LinkedHashSet;
+import io.onedev.server.model.support.NamedQuery;
+
public abstract class QuerySubscriptionSupport<T extends NamedQuery> {
public abstract LinkedHashSet<String> getUserQuerySubscriptions();
diff --git a/core/src/main/java/io/onedev/server/model/support/QueryWatchSupport.java b/core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/model/support/QueryWatchSupport.java
rename to core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java
index f13845fa44..dde63fce36 100644
--- a/core/src/main/java/io/onedev/server/model/support/QueryWatchSupport.java
+++ b/core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java
@@ -1,8 +1,10 @@
-package io.onedev.server.model.support;
+package io.onedev.server.util.watch;
import java.util.LinkedHashMap;
import java.util.Map;
+import io.onedev.server.model.support.NamedQuery;
+
public abstract class QueryWatchSupport<T extends NamedQuery> {
public abstract LinkedHashMap<String, Boolean> getUserQueryWatches();
diff --git a/core/src/main/java/io/onedev/server/model/support/WatchStatus.java b/core/src/main/java/io/onedev/server/util/watch/WatchStatus.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/model/support/WatchStatus.java
rename to core/src/main/java/io/onedev/server/util/watch/WatchStatus.java
index c4a98d07ad..f509bee2f3 100644
--- a/core/src/main/java/io/onedev/server/model/support/WatchStatus.java
+++ b/core/src/main/java/io/onedev/server/util/watch/WatchStatus.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support;
+package io.onedev.server.util.watch;
public enum WatchStatus {
DEFAULT("Default"),
diff --git a/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
index 0f531742a0..02121b00db 100644
--- a/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
+++ b/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
@@ -16,12 +16,12 @@ import io.onedev.server.manager.UrlManager;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.model.PullRequestAction;
+import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
@@ -91,9 +91,9 @@ public class DefaultUrlManager implements UrlManager {
}
@Override
- public String urlFor(PullRequestAction action) {
- String url = urlFor(action.getRequest());
- return url + "#" + action.getAnchor();
+ public String urlFor(PullRequestChange change) {
+ String url = urlFor(change.getRequest());
+ return url + "#" + change.getAnchor();
}
@Override
@@ -107,7 +107,7 @@ public class DefaultUrlManager implements UrlManager {
}
@Override
- public String urlFor(IssueAction change) {
+ public String urlFor(IssueChange change) {
return urlFor(change.getIssue()) + "#" + change.getAnchor();
}
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 ccb873b37a..c3ef027a95 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -28,17 +28,17 @@ 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.issueboards.IssueBoardsPage;
-import io.onedev.server.web.page.project.issues.issuedetail.IssueActivitiesPage;
-import io.onedev.server.web.page.project.issues.issuedetail.IssueBuildsPage;
-import io.onedev.server.web.page.project.issues.issuedetail.IssueCommitsPage;
-import io.onedev.server.web.page.project.issues.issuedetail.IssuePullRequestsPage;
-import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
+import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
+import io.onedev.server.web.page.project.issues.create.NewIssuePage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issues.detail.IssueBuildsPage;
+import io.onedev.server.web.page.project.issues.detail.IssueCommitsPage;
+import io.onedev.server.web.page.project.issues.detail.IssuePullRequestsPage;
+import io.onedev.server.web.page.project.issues.list.IssueListPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;
import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;
-import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;
import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;
import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
diff --git a/core/src/main/java/io/onedev/server/web/asset/chart/EChartsResourceReference.java b/core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/asset/chart/EChartsResourceReference.java
rename to core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.java
index f0a6845609..ed8931885f 100644
--- a/core/src/main/java/io/onedev/server/web/asset/chart/EChartsResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/asset/echarts/EChartsResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.asset.chart;
+package io.onedev.server.web.asset.echarts;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/web/asset/chart/echarts.min.js b/core/src/main/java/io/onedev/server/web/asset/echarts/echarts.min.js
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/asset/chart/echarts.min.js
rename to core/src/main/java/io/onedev/server/web/asset/echarts/echarts.min.js
diff --git a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index a6fb0b9ca8..2d5b8fefc7 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -19,9 +19,9 @@ import io.onedev.codeassist.parser.ParseExpect;
import io.onedev.codeassist.parser.TerminalExpect;
import io.onedev.server.exception.OneException;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.search.entity.build.BuildQueryParser;
+import io.onedev.server.util.BuildConstants;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
index 28731c7534..b805efa07c 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
@@ -19,10 +19,10 @@ import io.onedev.codeassist.parser.ParseExpect;
import io.onedev.codeassist.parser.TerminalExpect;
import io.onedev.server.exception.OneException;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.codecomment.CodeCommentConstants;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser;
+import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index 0abece90a6..c413c04980 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -1,15 +1,15 @@
package io.onedev.server.web.behavior;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_COMMENT;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_COMMENT_COUNT;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_DESCRIPTION;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_MILESTONE;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_NUMBER;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_STATE;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_SUBMIT_DATE;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_TITLE;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_UPDATE_DATE;
-import static io.onedev.server.model.support.issue.IssueConstants.FIELD_VOTE_COUNT;
+import static io.onedev.server.util.IssueConstants.FIELD_COMMENT;
+import static io.onedev.server.util.IssueConstants.FIELD_COMMENT_COUNT;
+import static io.onedev.server.util.IssueConstants.FIELD_DESCRIPTION;
+import static io.onedev.server.util.IssueConstants.FIELD_MILESTONE;
+import static io.onedev.server.util.IssueConstants.FIELD_NUMBER;
+import static io.onedev.server.util.IssueConstants.FIELD_STATE;
+import static io.onedev.server.util.IssueConstants.FIELD_SUBMIT_DATE;
+import static io.onedev.server.util.IssueConstants.FIELD_TITLE;
+import static io.onedev.server.util.IssueConstants.FIELD_UPDATE_DATE;
+import static io.onedev.server.util.IssueConstants.FIELD_VOTE_COUNT;
import java.util.ArrayList;
import java.util.List;
@@ -40,13 +40,13 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryLexer;
import io.onedev.server.search.entity.issue.IssueQueryParser;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.BuildChoiceInput;
import io.onedev.server.util.inputspec.InputContext;
diff --git a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index b38da5258f..deb63facf0 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -24,11 +24,11 @@ import io.onedev.server.git.RefInfo;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;
import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index fec05960a1..de0edb6aae 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -43,9 +43,9 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.manager.BuildManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.build.BuildConstants;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.BuildConstants;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.BuildQueryBehavior;
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
index be98917e5e..f6a365e868 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
@@ -19,9 +19,4 @@
<table wicket:id="comments" class="table"></table>
</div>
</div>
- <wicket:fragment wicket:id="lastActivityFrag">
- <span wicket:id="user"></span>
- <span wicket:id="description"></span>
- <span wicket:id="date"></span>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 41060e793a..39126ce711 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -26,7 +26,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -287,17 +286,12 @@ public abstract class CodeCommentListPanel extends GenericPanel<String> {
});
- columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Last Activity")) {
+ columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Last Update")) {
@Override
public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {
CodeComment comment = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "lastActivityFrag", CodeCommentListPanel.this);
- fragment.add(new Label("user", comment.getLastActivity().getUserName()));
- fragment.add(new Label("description", comment.getLastActivity().getDescription()));
- fragment.add(new Label("date", DateUtils.formatAge(comment.getLastActivity().getDate())));
-
- cellItem.add(fragment);
+ cellItem.add(new Label(componentId, DateUtils.formatAge(comment.getUpdateDate())));
}
});
@@ -310,7 +304,7 @@ public abstract class CodeCommentListPanel extends GenericPanel<String> {
Item<CodeComment> item = super.newRowItem(id, index, model);
CodeComment comment = model.getObject();
item.add(AttributeAppender.append("class",
- comment.isVisitedAfter(comment.getLastActivity().getDate())?"comment":"comment new"));
+ comment.isVisitedAfter(comment.getUpdateDate())?"comment":"comment new"));
return item;
}
});
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 8098b079ad..ae7ba35fb4 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -97,7 +97,7 @@ public abstract class CodeCommentPanel extends Panel {
@Override
protected String load() {
- return getComment().isVisitedAfter(getComment().getDate())?"": "new";
+ return getComment().isVisitedAfter(getComment().getCreateDate())?"": "new";
}
}));
@@ -106,7 +106,7 @@ public abstract class CodeCommentPanel extends Panel {
commentContainer.add(new AvatarLink("userAvatar", userForDisplay));
commentContainer.add(new UserLink("userName", userForDisplay));
commentContainer.add(new Label("action", "commented"));
- commentContainer.add(new Label("date", DateUtils.formatAge(getComment().getDate())));
+ commentContainer.add(new Label("date", DateUtils.formatAge(getComment().getCreateDate())));
commentContainer.add(new MarkdownViewer("content", new IModel<String>() {
@@ -123,7 +123,7 @@ public abstract class CodeCommentPanel extends Panel {
public void setObject(String object) {
CodeComment comment = getComment();
comment.setContent(object);
- OneDev.getInstance(CodeCommentManager.class).save(comment, getPullRequest());
+ OneDev.getInstance(CodeCommentManager.class).update(SecurityUtils.getUser(), comment);
}
}, null));
@@ -190,7 +190,7 @@ public abstract class CodeCommentPanel extends Panel {
CodeComment comment = getComment();
comment.setContent(contentInput.getModelObject());
- OneDev.getInstance(CodeCommentManager.class).save(comment, getPullRequest());
+ OneDev.getInstance(CodeCommentManager.class).update(SecurityUtils.getUser(), comment);
WebMarkupContainer commentContainer = newCommentContainer();
fragment.replaceWith(commentContainer);
target.add(commentContainer);
@@ -225,7 +225,7 @@ public abstract class CodeCommentPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
onDeleteComment(target, getComment());
- OneDev.getInstance(CodeCommentManager.class).delete(getComment());
+ OneDev.getInstance(CodeCommentManager.class).delete(SecurityUtils.getUser(), getComment());
}
});
@@ -525,7 +525,7 @@ public abstract class CodeCommentPanel extends Panel {
lastReplyDate = lastReply.getDate();
prevReplyMarkupId = lastReplyContainer.getMarkupId();
} else {
- lastReplyDate = getComment().getDate();
+ lastReplyDate = getComment().getCreateDate();
prevReplyMarkupId = get("comment").getMarkupId();
}
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.html b/core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.html
new file mode 100644
index 0000000000..9e31cebf7d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.html
@@ -0,0 +1,5 @@
+<wicket:panel>
+ <div class="referenced-from">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java
new file mode 100644
index 0000000000..b607649fa8
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java
@@ -0,0 +1,41 @@
+package io.onedev.server.web.component.codecomment.referencedfrom;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.CodeCommentManager;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+
+@SuppressWarnings("serial")
+public class ReferencedFromCodeCommentPanel extends GenericPanel<CodeComment> {
+
+ public ReferencedFromCodeCommentPanel(String id, Long commentId) {
+ super(id, new LoadableDetachableModel<CodeComment>() {
+
+ @Override
+ protected CodeComment load() {
+ return OneDev.getInstance(CodeCommentManager.class).load(commentId);
+ }
+
+ });
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ CodeComment comment = getModelObject();
+ PageParameters params = ProjectBlobPage.paramsOf(comment);
+ Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectBlobPage.class, params);
+ link.add(new Label("label", comment.getMarkPos().getPath()));
+
+ add(link);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 14b5330113..2c3d3094e8 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -900,7 +900,7 @@ public class RevisionDiffPanel extends Panel {
comment.setContent(contentInput.getModelObject());
comment.setCompareContext(getCompareContext(comment.getMarkPos().getCommit()));
- OneDev.getInstance(CodeCommentManager.class).save(comment, requestModel.getObject());
+ OneDev.getInstance(CodeCommentManager.class).create(comment, requestModel.getObject());
CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css b/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css
index 39d62ff319..546399336c 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css
+++ b/core/src/main/java/io/onedev/server/web/component/diff/table/diff-table.css
@@ -117,7 +117,3 @@ table.diff>tbody>tr:hover>td {
table.plain.diff {
border: none;
}
-table.plain.diff>tbody>tr>td {
- padding: 0 12px 6px 0;
- background: white !important;
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java b/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
index f9d73b6123..dad5cc49e6 100644
--- a/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java
@@ -18,8 +18,8 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
-import io.onedev.server.model.support.WatchStatus;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.watch.WatchStatus;
import io.onedev.server.web.component.avatar.AvatarLink;
import io.onedev.server.web.component.user.list.UserListLink;
import io.onedev.server.web.component.watchstatus.WatchStatusLink;
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/state/IssueStateLabel.java b/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java
similarity index 73%
rename from core/src/main/java/io/onedev/server/web/component/issue/state/IssueStateLabel.java
rename to core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java
index c868b1e121..0e23105b1a 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/state/IssueStateLabel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java
@@ -1,8 +1,6 @@
-package io.onedev.server.web.component.issue.state;
+package io.onedev.server.web.component.issue;
import org.apache.wicket.behavior.AttributeAppender;
-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.model.IModel;
@@ -39,13 +37,7 @@ public class IssueStateLabel extends Label {
add(AttributeAppender.append("title", "State"));
}
- add(AttributeAppender.append("class", "issue-state referenceable-status"));
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new IssueStateCssResourceReference()));
+ add(AttributeAppender.append("class", "issue-state label"));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index d1ae5e7b76..601527c522 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -32,18 +32,24 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
+import io.onedev.server.manager.CodeCommentManager;
import io.onedev.server.manager.IssueCommentManager;
+import io.onedev.server.manager.IssueManager;
+import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.avatar.AvatarLink;
-import io.onedev.server.web.component.issue.activities.activity.ActionActivity;
-import io.onedev.server.web.component.issue.activities.activity.CommentedActivity;
+import io.onedev.server.web.component.issue.activities.activity.IssueChangeActivity;
+import io.onedev.server.web.component.issue.activities.activity.IssueCommentedActivity;
import io.onedev.server.web.component.issue.activities.activity.IssueActivity;
-import io.onedev.server.web.component.issue.activities.activity.OpenedActivity;
+import io.onedev.server.web.component.issue.activities.activity.IssueOpenedActivity;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
import io.onedev.server.web.page.security.LoginPage;
@@ -128,17 +134,32 @@ public abstract class IssueActivitiesPanel extends Panel {
private List<IssueActivity> getActivities() {
List<IssueActivity> activities = new ArrayList<>();
- activities.add(new OpenedActivity(getIssue()));
+ activities.add(new IssueOpenedActivity(getIssue()));
List<IssueActivity> otherActivities = new ArrayList<>();
if (showComments) {
for (IssueComment comment: getIssue().getComments())
- otherActivities.add(new CommentedActivity(comment));
+ otherActivities.add(new IssueCommentedActivity(comment));
}
if (showChangeHistory) {
- for (IssueAction action: getIssue().getActions())
- otherActivities.add(new ActionActivity(action));
+ for (IssueChange change: getIssue().getChanges()) {
+ if (change.getData() instanceof IssueReferencedFromIssueData) {
+ IssueReferencedFromIssueData referencedFromIssueData = (IssueReferencedFromIssueData) change.getData();
+ if (OneDev.getInstance(IssueManager.class).get(referencedFromIssueData.getIssueId()) != null)
+ otherActivities.add(new IssueChangeActivity(change));
+ } else if (change.getData() instanceof IssueReferencedFromPullRequestData) {
+ IssueReferencedFromPullRequestData referencedFromPullRequestData = (IssueReferencedFromPullRequestData) change.getData();
+ if (OneDev.getInstance(PullRequestManager.class).get(referencedFromPullRequestData.getRequestId()) != null)
+ otherActivities.add(new IssueChangeActivity(change));
+ } else if (change.getData() instanceof IssueReferencedFromCodeCommentData) {
+ IssueReferencedFromCodeCommentData referencedFromCodeCommentData = (IssueReferencedFromCodeCommentData) change.getData();
+ if (OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId()) != null)
+ otherActivities.add(new IssueChangeActivity(change));
+ } else {
+ otherActivities.add(new IssueChangeActivity(change));
+ }
+ }
}
otherActivities.sort((o1, o2) -> {
@@ -269,7 +290,7 @@ public abstract class IssueActivitiesPanel extends Panel {
@SuppressWarnings("deprecation")
Component lastActivityRow = activitiesView.get(activitiesView.size()-1);
- Component newActivityRow = newActivityRow(activitiesView.newChildId(), new CommentedActivity(comment));
+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), new IssueCommentedActivity(comment));
activitiesView.add(newActivityRow);
String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionPanel.html
deleted file mode 100644
index 08c1dda506..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionPanel.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<wicket:panel>
- <div class="action activity">
- <div class="head">
- <span wicket:id="user" class="user"></span> <span wicket:id="description"></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/component/issue/activities/activity/ActionPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionPanel.java
deleted file mode 100644
index ae06bf6045..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionPanel.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.onedev.server.web.component.issue.activities.activity;
-
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-
-import io.onedev.server.model.IssueAction;
-import io.onedev.server.model.User;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.link.UserLink;
-
-@SuppressWarnings("serial")
-class ActionPanel extends GenericPanel<IssueAction> {
-
- public ActionPanel(String id, IModel<IssueAction> model) {
- super(id, model);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- IssueAction action = getModelObject();
- User userForDisplay = User.getForDisplay(action.getUser(), action.getUserName());
- add(new UserLink("user", userForDisplay));
- add(new Label("description", action.getData().getDescription()));
- add(new Label("age", DateUtils.formatAge(action.getDate())));
-
- add(action.getData().render("body", action));
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/CommentedPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/CommentedPanel.html
deleted file mode 100644
index edcc676b81..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/CommentedPanel.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<wicket:panel>
- <div class="comment activity">
- <div class="head clearfix">
- <div class="pull-left">
- <span wicket:id="user" class="user"></span> commented <span wicket:id="age"></span>
- </div>
- </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/component/issue/activities/activity/ActionDataPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.html
similarity index 62%
rename from core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionDataPanel.html
rename to core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.html
index 92f5339477..760ff915fe 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionDataPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <div class="action-data">
+ <div class="diff-and-comment-aware">
<div wicket:id="diff"></div>
<div wicket:id="comment"></div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionDataPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java
similarity index 65%
rename from core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionDataPanel.java
rename to core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java
index b14a4a424f..439ea7335d 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionDataPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java
@@ -5,11 +5,11 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueActionManager;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.manager.IssueChangeManager;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.DiffSupport;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.diff.DiffSupport;
import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
@@ -17,13 +17,13 @@ import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
-public abstract class ActionDataPanel extends Panel {
+public abstract class DiffAndCommentAwarePanel extends Panel {
private static final String DIFF_ID = "diff";
private static final String COMMENT_ID = "comment";
- public ActionDataPanel(String id) {
+ public DiffAndCommentAwarePanel(String id) {
super(id);
}
@@ -31,39 +31,39 @@ public abstract class ActionDataPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- DiffSupport diffSupport = getAction().getData().getDiffSupport();
+ DiffSupport diffSupport = getDiffSupport();
if (diffSupport != null)
- add(new PlainDiffPanel(DIFF_ID, diffSupport.getOldLines(), "a.txt", diffSupport.getNewLines(), "b.txt", true));
+ add(new PlainDiffPanel(DIFF_ID, diffSupport.getOldLines(), diffSupport.getOldFileName(), diffSupport.getNewLines(), diffSupport.getNewFileName(), true));
else
add(new WebMarkupContainer(DIFF_ID).setVisible(false));
- if (getAction().getData().getCommentSupport() != null) {
+ if (getChange().getData().getCommentSupport() != null) {
add(new ProjectCommentPanel(COMMENT_ID) {
@Override
protected String getComment() {
- return getAction().getData().getCommentSupport().getComment();
+ return getChange().getData().getCommentSupport().getComment();
}
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
- getAction().getData().getCommentSupport().setComment(comment);
- OneDev.getInstance(IssueActionManager.class).save(getAction());
+ getChange().getData().getCommentSupport().setComment(comment);
+ OneDev.getInstance(IssueChangeManager.class).save(getChange());
}
@Override
protected Project getProject() {
- return getAction().getIssue().getProject();
+ return getChange().getIssue().getProject();
}
@Override
protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getAction().getIssue().getUUID());
+ return new ProjectAttachmentSupport(getProject(), getChange().getIssue().getUUID());
}
@Override
protected boolean canModifyOrDeleteComment() {
- return SecurityUtils.canModifyOrDelete(getAction());
+ return SecurityUtils.canModifyOrDelete(getChange());
}
@Override
@@ -87,6 +87,7 @@ public abstract class ActionDataPanel extends Panel {
}
}
- protected abstract IssueAction getAction();
+ protected abstract IssueChange getChange();
+ protected abstract DiffSupport getDiffSupport();
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionActivity.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java
similarity index 60%
rename from core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionActivity.java
rename to core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java
index 73d5f1466e..1e42c3e630 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/ActionActivity.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java
@@ -6,34 +6,34 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueActionManager;
-import io.onedev.server.model.IssueAction;
+import io.onedev.server.manager.IssueChangeManager;
+import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
import io.onedev.server.web.util.DeleteCallback;
@SuppressWarnings("serial")
-public class ActionActivity implements IssueActivity {
+public class IssueChangeActivity implements IssueActivity {
- private final Long actionId;
+ private final Long changeId;
- public ActionActivity(IssueAction action) {
- actionId = action.getId();
+ public IssueChangeActivity(IssueChange change) {
+ changeId = change.getId();
}
@Override
public Panel render(String panelId, DeleteCallback callback) {
- return new ActionPanel(panelId, new LoadableDetachableModel<IssueAction>() {
+ return new IssueChangePanel(panelId, new LoadableDetachableModel<IssueChange>() {
@Override
- protected IssueAction load() {
+ protected IssueChange load() {
return getChange();
}
});
}
- public IssueAction getChange() {
- return OneDev.getInstance(IssueActionManager.class).load(actionId);
+ public IssueChange getChange() {
+ return OneDev.getInstance(IssueChangeManager.class).load(changeId);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
new file mode 100644
index 0000000000..fae32ff124
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
@@ -0,0 +1,6 @@
+<wicket:panel>
+ <div class="head">
+ <span wicket:id="user" class="user"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>
+ </div>
+ <div wicket:id="body" class="body"></div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
new file mode 100644
index 0000000000..7332a97121
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
@@ -0,0 +1,32 @@
+package io.onedev.server.web.component.issue.activities.activity;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.User;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.component.link.UserLink;
+
+@SuppressWarnings("serial")
+class IssueChangePanel extends GenericPanel<IssueChange> {
+
+ public IssueChangePanel(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).setVisible(userForDisplay != null));
+ add(new Label("description", change.getData().getDescription()));
+ add(new Label("age", DateUtils.formatAge(change.getDate())));
+
+ add(change.getData().render("body", change));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/CommentedActivity.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/web/component/issue/activities/activity/CommentedActivity.java
rename to core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java
index 32d7d35e97..eecb0c1e54 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/CommentedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java
@@ -13,17 +13,17 @@ import io.onedev.server.model.User;
import io.onedev.server.web.util.DeleteCallback;
@SuppressWarnings("serial")
-public class CommentedActivity implements IssueActivity {
+public class IssueCommentedActivity implements IssueActivity {
private final Long commentId;
- public CommentedActivity(IssueComment comment) {
+ public IssueCommentedActivity(IssueComment comment) {
commentId = comment.getId();
}
@Override
public Panel render(String panelId, DeleteCallback deleteCallback) {
- return new CommentedPanel(panelId, new LoadableDetachableModel<IssueComment>() {
+ return new IssueCommentedPanel(panelId, new LoadableDetachableModel<IssueComment>() {
@Override
protected IssueComment load() {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.html
new file mode 100644
index 0000000000..3fda392080
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.html
@@ -0,0 +1,8 @@
+<wicket:panel>
+ <div class="head clearfix">
+ <div class="pull-left">
+ <span wicket:id="user" class="user"></span> commented <span wicket:id="age"></span>
+ </div>
+ </div>
+ <div wicket:id="body" class="body"></div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/CommentedPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
similarity index 74%
rename from core/src/main/java/io/onedev/server/web/component/issue/activities/activity/CommentedPanel.java
rename to core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
index 98d820a470..103901d587 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/CommentedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
@@ -20,11 +20,11 @@ import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
-class CommentedPanel extends GenericPanel<IssueComment> {
+class IssueCommentedPanel extends GenericPanel<IssueComment> {
private final DeleteCallback deleteCallback;
- public CommentedPanel(String id, IModel<IssueComment> model, DeleteCallback deleteCallback) {
+ public IssueCommentedPanel(String id, IModel<IssueComment> model, DeleteCallback deleteCallback) {
super(id, model);
this.deleteCallback = deleteCallback;
}
@@ -40,29 +40,29 @@ class CommentedPanel extends GenericPanel<IssueComment> {
@Override
protected String getComment() {
- return CommentedPanel.this.getComment().getContent();
+ return IssueCommentedPanel.this.getComment().getContent();
}
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
- CommentedPanel.this.getComment().setContent(comment);
- OneDev.getInstance(IssueCommentManager.class).save(CommentedPanel.this.getComment());
+ IssueCommentedPanel.this.getComment().setContent(comment);
+ OneDev.getInstance(IssueCommentManager.class).save(IssueCommentedPanel.this.getComment());
}
@Override
protected Project getProject() {
- return CommentedPanel.this.getComment().getIssue().getProject();
+ return IssueCommentedPanel.this.getComment().getIssue().getProject();
}
@Override
protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(CommentedPanel.this.getComment().getIssue().getProject(),
- CommentedPanel.this.getComment().getIssue().getUUID());
+ return new ProjectAttachmentSupport(IssueCommentedPanel.this.getComment().getIssue().getProject(),
+ IssueCommentedPanel.this.getComment().getIssue().getUUID());
}
@Override
protected boolean canModifyOrDeleteComment() {
- return SecurityUtils.canModifyOrDelete(CommentedPanel.this.getComment());
+ return SecurityUtils.canModifyOrDelete(IssueCommentedPanel.this.getComment());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/OpenedActivity.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java
similarity index 84%
rename from core/src/main/java/io/onedev/server/web/component/issue/activities/activity/OpenedActivity.java
rename to core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java
index 043c55558d..9fadd99719 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/OpenedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java
@@ -12,17 +12,17 @@ import io.onedev.server.model.User;
import io.onedev.server.web.util.DeleteCallback;
@SuppressWarnings("serial")
-public class OpenedActivity implements IssueActivity {
+public class IssueOpenedActivity implements IssueActivity {
private final Long issueId;
- public OpenedActivity(Issue issue) {
+ public IssueOpenedActivity(Issue issue) {
issueId = issue.getId();
}
@Override
public Panel render(String panelId, DeleteCallback deleteCallback) {
- return new OpenedPanel(panelId, new LoadableDetachableModel<Issue>() {
+ return new IssueOpenedPanel(panelId, new LoadableDetachableModel<Issue>() {
@Override
protected Issue load() {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.html
new file mode 100644
index 0000000000..3d2fa63008
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.html
@@ -0,0 +1,6 @@
+<wicket:panel>
+ <div class="head">
+ <span wicket:id="user" class="user"></span> opened <span wicket:id="age"></span>
+ </div>
+ <div wicket:id="body" class="body"></div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/OpenedPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
similarity index 88%
rename from core/src/main/java/io/onedev/server/web/component/issue/activities/activity/OpenedPanel.java
rename to core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
index 565de9d70d..02136c1378 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/OpenedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueManager;
+import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -20,9 +20,9 @@ import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
-class OpenedPanel extends GenericPanel<Issue> {
+class IssueOpenedPanel extends GenericPanel<Issue> {
- public OpenedPanel(String id, IModel<Issue> model) {
+ public IssueOpenedPanel(String id, IModel<Issue> model) {
super(id, model);
}
@@ -43,8 +43,7 @@ class OpenedPanel extends GenericPanel<Issue> {
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
- getIssue().setDescription(comment);
- OneDev.getInstance(IssueManager.class).save(getIssue());
+ OneDev.getInstance(IssueChangeManager.class).changeDescription(getIssue(), comment, SecurityUtils.getUser());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/OpenedPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/OpenedPanel.html
deleted file mode 100644
index 01edde3ad7..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/OpenedPanel.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<wicket:panel>
- <div class="open activity">
- <div class="head">
- <span wicket:id="user" class="user"></span> opened <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/component/issue/activities/issue-activities.css b/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
index 8ab7227b12..67fc781b5d 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
@@ -28,7 +28,7 @@
.issue-activities>table>tbody>tr>td.content {
padding-left: 20px;
}
-.issue-activities .activity>.head {
+.issue-activities .activity>.content>.head {
color: #888;
}
.issue-activities .activity.commit .body a.summary {
@@ -36,25 +36,27 @@
margin-right: 4px;
}
-.issue-activities .activity>.body {
+.issue-activities .activity>.content>.body {
margin-top: 8px;
}
-.issue-activities .activity>.body>.actions,
-.issue-activities .activity>.body>.action-data>div>.actions {
+.issue-activities .activity>.content>.body>.referenced-from .label {
+ line-height: inherit;
+}
+
+.issue-activities .activity>.content>.body>.actions {
margin-top: 8px;
}
-.issue-activities .activity>.body>.actions a,
-.issue-activities .activity>.body>.action-data>div>.actions a {
+.issue-activities .activity>.content>.body>.actions a {
color: #888;
margin-right: 0;
}
-.issue-activities .activity>.body .actions .middot {
+.issue-activities .activity>.content>.body .actions .middot {
margin: 0 4px;
}
-.issue-activities .activity>.body .action-data .plain.diff {
+.issue-activities .activity>.content>.body .plain.diff {
margin-bottom: 12px;
}
-.issue-activities .activity>.head a {
+.issue-activities .activity>.content>.head a {
color: #999;
margin-left: 8px;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
index f27b1628a6..9fbd2c8cbb 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.html
@@ -7,19 +7,7 @@
<a wicket:id="avatar" class="avatar"></a>
<a wicket:id="name" class="name"></a>
</wicket:fragment>
- <wicket:fragment wicket:id="issueFrag">
- <div class="issue referenceable">
- <a wicket:id="link"><span wicket:id="label"></span></a> <span wicket:id="state"></span>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="pullRequestFrag">
- <div class="pull-request referenceable">
- <a wicket:id="link"><span wicket:id="label"></span></a> <span wicket:id="status"></span>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="buildFrag">
- <div class="build referenceable">
- <a wicket:id="link"><span wicket:id="label"></span></a> <span wicket:id="status"></span>
- </div>
+ <wicket:fragment wicket:id="linkFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
</wicket:fragment>
</wicket:panel>
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index 04cec6a188..7af936fd98 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -14,7 +14,6 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
import org.unbescape.html.HtmlEscape;
import io.onedev.server.OneDev;
@@ -27,20 +26,17 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueField;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.IssueField;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.web.component.avatar.AvatarLink;
-import io.onedev.server.web.component.build.status.BuildStatusIcon;
-import io.onedev.server.web.component.issue.state.IssueStateLabel;
import io.onedev.server.web.component.link.UserLink;
-import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.issuedetail.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.ComponentContext;
import io.onedev.utils.ColorUtils;
@@ -76,36 +72,33 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
} else if (getField().getType().equals(InputSpec.ISSUE)) {
Issue issue = OneDev.getInstance(IssueManager.class).find(project, Long.valueOf(value));
if (issue != null) {
- Fragment issueFrag = new Fragment("value", "issueFrag", FieldValuesPanel.this);
+ Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));
link.add(new Label("label", "#" + issue.getNumber()));
- issueFrag.add(link);
- issueFrag.add(new IssueStateLabel("state", Model.of(issue)));
- item.add(issueFrag);
+ linkFrag.add(link);
+ item.add(linkFrag);
} else {
item.add(new Label("value", "#" + value));
}
} else if (getField().getType().equals(InputSpec.BUILD)) {
Build build = OneDev.getInstance(BuildManager.class).get(Long.valueOf(value));
if (build != null) {
- Fragment buildFrag = new Fragment("value", "buildFrag", FieldValuesPanel.this);
+ Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
ExternalLink link = new ExternalLink("link", build.getUrl());
link.add(new Label("label", StringUtils.abbreviate(build.getVersion(), MAX_BUILD_NAME_LEN)));
- buildFrag.add(link);
- buildFrag.add(new BuildStatusIcon("status", Model.of(build)));
- item.add(buildFrag);
+ linkFrag.add(link);
+ item.add(linkFrag);
} else {
item.add(new Label("value", "#" + value));
}
} else if (getField().getType().equals(InputSpec.PULLREQUEST)) {
PullRequest request = OneDev.getInstance(PullRequestManager.class).find(project, Long.valueOf(value));
if (request != null) {
- Fragment requestFrag = new Fragment("value", "pullRequestFrag", FieldValuesPanel.this);
+ Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(request, null));
link.add(new Label("label", "#" + request.getNumber()));
- requestFrag.add(link);
- requestFrag.add(new RequestStatusLabel("status", Model.of(request)));
- item.add(requestFrag);
+ linkFrag.add(link);
+ item.add(linkFrag);
} else {
item.add(new Label("value", "#" + value));
}
@@ -123,6 +116,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
"background-color: %s; color: %s;",
backgroundColor, fontColor);
label.add(AttributeAppender.append("style", style));
+ label.add(AttributeAppender.append("class", "label"));
item.add(AttributeAppender.append("class", "has-color"));
}
} finally {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css
index e8257200bb..61633b214d 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css
+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css
@@ -1,17 +1,6 @@
-.field-values .referenceable a {
- margin-right: 4px;
-}
-.field-values .referenceable .referenceable-status {
- font-size: 11px;
- padding: 2px 4px;
-}
.field-values .has-color {
- margin-bottom: 8px;
+ margin-bottom: 4px;
}
.field-values .has-color:last-child {
margin-bottom: 0;
}
-.field-values .has-color span {
- border-radius: 3px;
- padding: 2px 4px;
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index 76bc2ccf9e..dbe3ce2a79 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -30,13 +30,13 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueActionManager;
+import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
@@ -244,7 +244,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {
Map<String, Object> fieldValues = IssueUtils.getFieldValues(customFieldsBean, selectedFields);
- OneDev.getInstance(IssueActionManager.class).batchUpdate(
+ OneDev.getInstance(IssueChangeManager.class).batchUpdate(
getIssueIterator(), state, milestone, fieldValues, comment, SecurityUtils.getUser());
onUpdated(target);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/FieldsEditBean.java b/core/src/main/java/io/onedev/server/web/component/issue/list/FieldsEditBean.java
index 0904ed6f10..4ecfbc2f07 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/FieldsEditBean.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/FieldsEditBean.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import io.onedev.server.model.support.issue.IssueConstants;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 7688289768..e4f994adb5 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -46,26 +46,26 @@ import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.model.support.issue.IssueField;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.IssueConstants;
+import io.onedev.server.util.IssueField;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.component.avatar.AvatarLink;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
+import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
-import io.onedev.server.web.component.issue.state.IssueStateLabel;
import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.project.issues.issuedetail.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issues.create.NewIssuePage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
-import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QuerySaveSupport;
@@ -524,7 +524,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {
@Override
public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
IModel<Issue> rowModel) {
- cellItem.add(new Label(componentId, DateUtils.formatAge(rowModel.getObject().getLastActivity().getDate())));
+ cellItem.add(new Label(componentId, DateUtils.formatAge(rowModel.getObject().getUpdateDate())));
}
});
break;
@@ -610,7 +610,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {
Item<Issue> item = super.newRowItem(id, index, model);
Issue issue = model.getObject();
item.add(AttributeAppender.append("class",
- issue.isVisitedAfter(issue.getLastActivity().getDate())?"issue":"issue new"));
+ issue.isVisitedAfter(issue.getUpdateDate())?"issue":"issue new"));
return item;
}
});
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index 97c86621ef..557973190c 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -30,21 +30,21 @@ import org.apache.wicket.request.cycle.RequestCycle;
import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueActionManager;
+import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.model.support.issue.IssueField;
import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
import io.onedev.server.model.support.issue.workflow.TransitionSpec;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.IssueConstants;
+import io.onedev.server.util.IssueField;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.dateinput.DateInput;
-import io.onedev.server.web.component.issue.state.IssueStateLabel;
+import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
import io.onedev.server.web.editable.BeanContext;
@@ -153,7 +153,7 @@ public abstract class IssueOperationsPanel extends Panel {
getIssue().removeFields(transition.getRemoveFields());
Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean, trigger.getPromptFields());
- IssueActionManager manager = OneDev.getInstance(IssueActionManager.class);
+ IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);
manager.changeState(getIssue(), transition.getToState(), fieldValues, comment, SecurityUtils.getUser());
onStateChanged(target);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css b/core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
index fbd5f4c778..6dd177460b 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
@@ -2,9 +2,7 @@
margin-bottom: 20px;
}
.issue-operations>.state-and-actions>.issue-state {
- font-size: 16px;
- display: block;
- padding: 4px 8px;
+ font-size: 20px;
}
.issue-operations>.state-and-actions>* {
margin-right: 20px;
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html b/core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html
new file mode 100644
index 0000000000..aeda33e237
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html
@@ -0,0 +1,6 @@
+<wicket:panel>
+ <div class="referenced-from clearfix">
+ <a wicket:id="link" class="pull-left"><span wicket:id="label"></span></a>
+ <span wicket:id="state" class="pull-right"></span>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
new file mode 100644
index 0000000000..ea1a1909ce
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
@@ -0,0 +1,50 @@
+package io.onedev.server.web.component.issue.referencedfrom;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.IssueManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.web.component.issue.IssueStateLabel;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
+
+@SuppressWarnings("serial")
+public class ReferencedFromIssuePanel extends GenericPanel<Issue> {
+
+ public ReferencedFromIssuePanel(String id, Long issueId) {
+ super(id, new LoadableDetachableModel<Issue>() {
+
+ @Override
+ protected Issue load() {
+ return OneDev.getInstance(IssueManager.class).load(issueId);
+ }
+
+ });
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new IssueStateLabel("state", getModel()));
+
+ Project project = ((ProjectPage)getPage()).getProject();
+
+ Issue issue = getModelObject();
+
+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));
+ add(link);
+ if (issue.getProject().equals(project)) {
+ link.add(new Label("label", "#" + issue.getNumber() + " - " + issue.getTitle()));
+ } else {
+ link.add(new Label("label", issue.getProject().getName() + "#" + issue.getNumber() + " - " + issue.getTitle()));
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index ccc258a255..ab623d1ae0 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -36,7 +36,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.PropertyModel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueActionManager;
+import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.IssueVoteManager;
import io.onedev.server.manager.IssueWatchManager;
@@ -48,10 +48,10 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
-import io.onedev.server.model.support.issue.IssueField;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.IssueField;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.web.component.avatar.AvatarLink;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
@@ -213,7 +213,7 @@ public abstract class IssueSidePanel extends Panel {
super.onSubmit(target, form);
Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean, getIssue().getFieldNames());
- OneDev.getInstance(IssueActionManager.class).changeFields(getIssue(), fieldValues, SecurityUtils.getUser());
+ OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues, SecurityUtils.getUser());
Component fieldsContainer = newFieldsContainer();
IssueSidePanel.this.replace(fieldsContainer);
@@ -475,8 +475,8 @@ public abstract class IssueSidePanel extends Panel {
return getIssue().getProject();
}
- private IssueActionManager getIssueChangeManager() {
- return OneDev.getInstance(IssueActionManager.class);
+ private IssueChangeManager getIssueChangeManager() {
+ return OneDev.getInstance(IssueChangeManager.class);
}
private IssueManager getIssueManager() {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/state/IssueStateCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/issue/state/IssueStateCssResourceReference.java
deleted file mode 100644
index 62bacbd2f5..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/issue/state/IssueStateCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.issue.state;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class IssueStateCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public IssueStateCssResourceReference() {
- super(IssueStateCssResourceReference.class, "issue-state.css");
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/state/issue-state.css b/core/src/main/java/io/onedev/server/web/component/issue/state/issue-state.css
deleted file mode 100644
index 70f0a4d519..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/issue/state/issue-state.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.issue-state {
- border-radius: 3px;
- padding: 2px 4px;
- display: inline;
- font-weight: bold;
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
index 9e312024d8..01baca98d7 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
@@ -15,7 +15,7 @@ import org.apache.wicket.model.Model;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueActionManager;
+import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.model.Issue;
import io.onedev.server.security.SecurityUtils;
@@ -43,7 +43,7 @@ public abstract class IssueTitlePanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- OneDev.getInstance(IssueActionManager.class).changeTitle(getIssue(), titleInput.getModelObject(), SecurityUtils.getUser());
+ OneDev.getInstance(IssueChangeManager.class).changeTitle(getIssue(), titleInput.getModelObject(), SecurityUtils.getUser());
Fragment titleViewer = newTitleViewer();
titleEditor.replaceWith(titleViewer);
diff --git a/core/src/main/java/io/onedev/server/web/component/link/ProjectLink.java b/core/src/main/java/io/onedev/server/web/component/link/ProjectLink.java
index 9649ac567c..68397eba93 100644
--- a/core/src/main/java/io/onedev/server/web/component/link/ProjectLink.java
+++ b/core/src/main/java/io/onedev/server/web/component/link/ProjectLink.java
@@ -6,7 +6,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
+import io.onedev.server.web.page.project.issues.list.IssueListPage;
public class ProjectLink extends ViewStateAwarePageLink<Void> {
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index 649567e510..861352eeb2 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -30,8 +30,8 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.avatar.AvatarManager;
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
index 66cdf56329..0e94929498 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
@@ -316,18 +316,16 @@ body.fullscreen {
color: #333;
text-decoration: none;
}
+#reference-tooltip {
+ z-index: 1000;
+}
#reference-tooltip .content {
background-color: #FBFCC5;
border: 1px solid black;
border-radius: 4px;
padding: 12px;
- z-index: 10000;
}
-#reference-tooltip .content.issue .state,
-#reference-tooltip .content.pull-request .status {
- border-radius: 3px;
- padding: 2px 4px;
- font-weight: bold;
+#reference-tooltip .content .label {
margin-right: 4px;
}
#reference-tooltip .content.user {
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index 552439c6ce..39bcd97be5 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -955,7 +955,7 @@ onedev.server.markdown = {
var $tooltip = $("<div id='reference-tooltip'></div>");
$tooltip.data("trigger", this);
$tooltip.data("alignment", alignment);
- $container.append($tooltip);
+ $("body").append($tooltip);
referenceCallback(referenceType, referenceId);
return $tooltip;
}
@@ -967,7 +967,7 @@ onedev.server.markdown = {
var $tooltip = $("#reference-tooltip");
$tooltip.append("" +
"<div class='content issue'>" +
- " <span class='state'></span> <span class='title'></span>" +
+ " <span class='state label'></span> <span class='title'></span>" +
"</div>");
$tooltip.find(".state").css({
"color": stateFontColor,
diff --git a/core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.java b/core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.java
index a1214bcd33..4c60b929ff 100644
--- a/core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.java
+++ b/core/src/main/java/io/onedev/server/web/component/pullrequest/RequestStatusLabel.java
@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
+import io.onedev.server.util.PullRequestConstants;
@SuppressWarnings("serial")
public class RequestStatusLabel extends Label {
@@ -43,11 +43,11 @@ public class RequestStatusLabel extends Label {
PullRequest request = getPullRequest();
CloseInfo closeInfo = request.getCloseInfo();
if (closeInfo == null)
- return "label label-warning request-status referenceable-status";
+ return "label label-warning request-status";
else if (closeInfo.getStatus() == CloseInfo.Status.MERGED)
- return "label label-success request-status referenceable-status";
+ return "label label-success request-status";
else
- return "label label-danger request-status referenceable-status";
+ return "label label-danger request-status";
}
}));
diff --git a/core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html b/core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html
new file mode 100644
index 0000000000..aeda33e237
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html
@@ -0,0 +1,6 @@
+<wicket:panel>
+ <div class="referenced-from clearfix">
+ <a wicket:id="link" class="pull-left"><span wicket:id="label"></span></a>
+ <span wicket:id="state" class="pull-right"></span>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java b/core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
new file mode 100644
index 0000000000..629425494d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
@@ -0,0 +1,51 @@
+package io.onedev.server.web.component.pullrequest.referencedfrom;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.PullRequestManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
+
+@SuppressWarnings("serial")
+public class ReferencedFromPullRequestPanel extends GenericPanel<PullRequest> {
+
+ public ReferencedFromPullRequestPanel(String id, Long requestId) {
+ super(id, new LoadableDetachableModel<PullRequest>() {
+
+ @Override
+ protected PullRequest load() {
+ return OneDev.getInstance(PullRequestManager.class).load(requestId);
+ }
+
+ });
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new RequestStatusLabel("state", getModel()));
+
+ Project project = ((ProjectPage)getPage()).getProject();
+
+ PullRequest request = getModelObject();
+
+ Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,
+ PullRequestActivitiesPage.paramsOf(request, null));
+ add(link);
+ if (request.getTargetProject().equals(project)) {
+ link.add(new Label("label", "#" + request.getNumber() + " - " + request.getTitle()));
+ } else {
+ link.add(new Label("label", request.getTargetProject().getName() + "#" + request.getNumber() + " - " + request.getTitle()));
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.java b/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.java
index 802e1b7767..4084ddadd8 100644
--- a/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.java
+++ b/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.LoadableDetachableModel;
-import io.onedev.server.model.support.WatchStatus;
+import io.onedev.server.util.watch.WatchStatus;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
diff --git a/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java
index 814baceba1..b5c4b459ac 100644
--- a/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.panel.Panel;
-import io.onedev.server.model.support.WatchStatus;
+import io.onedev.server.util.watch.WatchStatus;
@SuppressWarnings("serial")
abstract class WatchStatusPanel extends Panel {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java
index 003216f630..b07adaabbb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java
@@ -6,7 +6,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
+import io.onedev.server.web.page.project.issues.list.IssueListPage;
@SuppressWarnings("serial")
public class NoCommitsPage extends ProjectPage {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 690d044be9..d46b234166 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -46,9 +46,9 @@ 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.IssuesPage;
-import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;
-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.project.issues.create.NewIssuePage;
+import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
+import io.onedev.server.web.page.project.issues.list.IssueListPage;
import io.onedev.server.web.page.project.moreinfo.MoreInfoPanel;
import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;
import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index 4164c5ea4d..275c4c58df 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -510,7 +510,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
comment.setProject(context.getProject());
comment.setCompareContext(getCompareContext());
- OneDev.getInstance(CodeCommentManager.class).save(comment, context.getPullRequest());
+ OneDev.getInstance(CodeCommentManager.class).create(comment, context.getPullRequest());
CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 33cda10951..7c2afbed4f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -63,11 +63,11 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.ProjectAndBranch;
-import io.onedev.server.model.support.pullrequest.PullRequestConstants;
import io.onedev.server.search.entity.pullrequest.OpenCriteria;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.component.branch.choice.BranchChoiceProvider;
import io.onedev.server.web.component.branch.choice.BranchSingleChoice;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java
index 07ac447958..606ce7ebd6 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java
@@ -17,8 +17,8 @@ import io.onedev.server.manager.BuildQuerySettingManager;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.BuildQuerySetting;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.NamedBuildQuery;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.build.list.BuildListPanel;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java b/core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java
index 50db425993..d5db3feb5e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java
@@ -5,7 +5,7 @@ import java.util.List;
import javax.validation.constraints.NotNull;
-import io.onedev.server.model.support.build.NamedBuildQuery;
+import io.onedev.server.model.support.NamedBuildQuery;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/NamedCodeCommentQueriesBean.java b/core/src/main/java/io/onedev/server/web/page/project/comments/NamedCodeCommentQueriesBean.java
index 3cb5e407ca..d6d959555d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/comments/NamedCodeCommentQueriesBean.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/NamedCodeCommentQueriesBean.java
@@ -5,7 +5,7 @@ import java.util.List;
import javax.validation.constraints.NotNull;
-import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;
+import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
index 3c874a8da5..aca99bb787 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
@@ -18,8 +18,8 @@ import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.CodeCommentQuerySetting;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.model.support.codecomment.NamedCodeCommentQuery;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.codecomment.CodeCommentListPanel;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
index 84b1e70a9d..fda55cf62f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
@@ -23,8 +23,8 @@ import io.onedev.server.web.component.tabbable.PageTabLink;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.issueboards.IssueBoardsPage;
-import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
+import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
+import io.onedev.server.web.page.project.issues.list.IssueListPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
index 9143252438..1af119a83d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.util.ArrayList;
import java.util.List;
@@ -24,7 +24,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueActionManager;
+import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -35,7 +35,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
+import io.onedev.server.web.page.project.issues.list.IssueListPage;
import io.onedev.server.web.util.ajaxlistener.AppendLoadingIndicatorListener;
@SuppressWarnings("serial")
@@ -148,7 +148,7 @@ abstract class BacklogColumnPanel extends Panel {
Issue issue = OneDev.getInstance(IssueManager.class).load(params.getParameterValue("issue").toLong());
if (!SecurityUtils.canAdministrate(issue.getProject().getFacade()))
throw new UnauthorizedException("Permission denied");
- OneDev.getInstance(IssueActionManager.class).changeMilestone(issue, null, SecurityUtils.getUser());
+ OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, null, SecurityUtils.getUser());
target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, true);", issue.getId()));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
similarity index 74%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
index 8a05b56426..32a71c7d5d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
@@ -1,6 +1,10 @@
<wicket:panel>
<div class="head clearfix">
- <div wicket:id="state" class="state pull-left"></div>
+ <wicket:enclosure child="state">
+ <div class="state pull-left">
+ <span wicket:id="state"></span>
+ </div>
+ </wicket:enclosure>
<div wicket:id="fields" class="field pull-left"></div>
<a wicket:id="detail" class="detail pull-left" title="Click to show issue details"><i class="fa fa-window-maximize"></i></a>
<div class="pull-right avatars">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index 7a3bdff5a3..869d5737f3 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardCardPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.util.List;
@@ -26,18 +26,18 @@ import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.IssueConstants;
-import io.onedev.server.model.support.issue.IssueField;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.IssueConstants;
+import io.onedev.server.util.IssueField;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.avatar.AvatarLink;
+import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
-import io.onedev.server.web.component.issue.state.IssueStateLabel;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.modal.ModalPanel.Size;
-import io.onedev.server.web.page.project.issues.issuedetail.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
import io.onedev.server.web.util.ajaxlistener.AppendLoadingIndicatorListener;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
similarity index 97%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index 67602f6f10..70e3933f78 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.util.ArrayList;
import java.util.HashMap;
@@ -30,7 +30,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueActionManager;
+import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Issue;
@@ -38,7 +38,6 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.IssueBoard;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
import io.onedev.server.model.support.issue.workflow.TransitionSpec;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
@@ -51,6 +50,7 @@ import io.onedev.server.search.entity.issue.MilestoneCriteria;
import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
@@ -61,7 +61,7 @@ import io.onedev.server.web.component.avatar.AvatarLink;
import io.onedev.server.web.component.link.UserLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;
+import io.onedev.server.web.page.project.issues.list.IssueListPage;
import io.onedev.server.web.util.ComponentContext;
import io.onedev.server.web.util.ajaxlistener.AppendLoadingIndicatorListener;
@@ -332,7 +332,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
if (!SecurityUtils.canAdministrate(issue.getProject().getFacade()))
throw new UnauthorizedException("Permission denied");
- OneDev.getInstance(IssueActionManager.class).changeMilestone(issue, getMilestone(), SecurityUtils.getUser());
+ OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone(), SecurityUtils.getUser());
markAccepted(target, issue, true);
} else if (fieldName.equals(IssueConstants.FIELD_STATE)) {
IssueWorkflow workflow = getProject().getIssueWorkflow();
@@ -384,7 +384,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
};
} else {
- OneDev.getInstance(IssueActionManager.class).changeState(issue, getColumn(), new HashMap<>(), null, SecurityUtils.getUser());
+ OneDev.getInstance(IssueChangeManager.class).changeState(issue, getColumn(), new HashMap<>(), null, SecurityUtils.getUser());
markAccepted(target, issue, true);
}
} else {
@@ -393,7 +393,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
Map<String, Object> fieldValues = new HashMap<>();
fieldValues.put(fieldName, getColumn());
- OneDev.getInstance(IssueActionManager.class).changeFields(issue, fieldValues, SecurityUtils.getUser());
+ OneDev.getInstance(IssueChangeManager.class).changeFields(issue, fieldValues, SecurityUtils.getUser());
markAccepted(target, issue, true);
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.java
similarity index 98%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.java
index 07f080fdf8..7e0b57e5b7 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.util.ArrayList;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardCountLabel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardCountLabel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java
index d60f25b712..8e17708494 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardCountLabel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.util.Collection;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
similarity index 99%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
index 6deadb9f8b..b35f0ee414 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
similarity index 98%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
index 8c23b89f79..d004bd905b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
similarity index 99%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index ce53554898..a2378a9dd4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.util.ArrayList;
import java.util.Comparator;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsResourceReference.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsResourceReference.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsResourceReference.java
index 50fbd92c53..57c1c1c02e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueBoardsResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueDragging.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueDragging.java
similarity index 86%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueDragging.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueDragging.java
index 0737cd8079..e9fa0640ee 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/IssueDragging.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueDragging.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/MilestoneEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/MilestoneEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/MilestoneEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java
similarity index 98%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/MilestoneEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java
index 5d449e5781..5283c9aaa3 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/MilestoneEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java
similarity index 98%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java
index 18b74a4758..104bbf5ec9 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewBoardPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.util.ArrayList;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java
similarity index 97%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java
index 6a0ca0ead9..bd987eb1f8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewMilestonePanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewMilestonePanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewMilestonePanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java
similarity index 98%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewMilestonePanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java
index 9ddacc81f4..fc33fb9919 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewMilestonePanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
index 5f7408b64b..8668e32bd5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issueboards;
+package io.onedev.server.web.page.project.issues.boards;
import java.io.Serializable;
import java.util.List;
@@ -12,7 +12,7 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.IssueActionManager;
+import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.issue.workflow.TransitionSpec;
import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
@@ -57,7 +57,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {
getIssue().removeFields(getTransition().getRemoveFields());
Map<String, Object> fieldValues = IssueUtils.getFieldValues(fieldBean, trigger.getPromptFields());
- OneDev.getInstance(IssueActionManager.class).changeState(getIssue(), getTransition().getToState(), fieldValues, null, SecurityUtils.getUser());
+ OneDev.getInstance(IssueChangeManager.class).changeState(getIssue(), getTransition().getToState(), fieldValues, null, SecurityUtils.getUser());
onSaved(target);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
similarity index 86%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
index a347bc8251..0986e4a0db 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
@@ -74,6 +74,8 @@
}
#issue-boards>.body>.column>.content>.head .badge {
margin-left: 8px;
+ margin-top: 3px;
+ font-size: 10px;
}
#issue-boards>.body>.column>.content>.head a {
color: #666;
@@ -137,44 +139,29 @@
#issue-boards>.body .card:hover a {
text-decoration: underline;
}
-#issue-boards>.body .card .state {
- border-radius: 2px;
- padding: 0 2px;
- font-size: 12px;
+#issue-boards>.body .card .field-values>.value:last-child {
+ margin-right: 0;
}
#issue-boards>.body .card .field-values>.value {
display: inline-block;
- background: #EEE;
- border-radius: 2px;
- padding: 0 2px;
- margin-right: 6px;
-}
-#issue-boards>.body .card .field-values>.has-color.value {
- border-radius: 0;
- border: none;
- padding: 0;
+ margin-right: 8px;
}
#issue-boards>.body .card .field-values>.value:last-child {
margin-right: 0;
}
-#issue-boards>.body .card .field-values, #issue-boards>.body .card .field-values a {
+#issue-boards>.body .card .state,
+#issue-boards>.body .card .field-values,
+#issue-boards>.body .card .field-values a {
font-size: 12px;
}
-#issue-boards>.body .card .field-values .referenceable>span {
- display: none;
-}
-#issue-boards>.body .card .field-values .has-color span {
- border-radius: 2px;
- padding: 0 2px;
-}
#issue-boards>.body>.column>.content>.body .loading-indicator {
margin-bottom: 16px;
}
#issue-boards>.body .card .detail {
color: #666;
text-decoration: none;
- font-size: 16px;
- margin-top: -3px;
+ font-size: 14px;
+ margin-top: -2px;
}
.board-card-detail>.body {
position: relative;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.js b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.js
rename to core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html
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/create/NewIssuePage.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index 8b737bb4ee..a88b19b640 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/create/NewIssuePage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.newissue;
+package io.onedev.server.web.page.project.issues.create;
import java.util.List;
@@ -21,7 +21,7 @@ import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.issue.create.NewIssueEditor;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.issuedetail.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.security.LoginPage;
@SuppressWarnings("serial")
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssueResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssueResourceReference.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssueResourceReference.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssueResourceReference.java
index e32d44cc6f..8f65f3435c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssueResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssueResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.newissue;
+package io.onedev.server.web.page.project.issues.create;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.css b/core/src/main/java/io/onedev/server/web/page/project/issues/create/new-issue.css
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.css
rename to core/src/main/java/io/onedev/server/web/page/project/issues/create/new-issue.css
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueActivitiesPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueActivitiesPage.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java
similarity index 90%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueActivitiesPage.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java
index ca73a0ebaa..f3f30b14ba 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueActivitiesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail;
+package io.onedev.server.web.page.project.issues.detail;
import org.apache.wicket.request.mapper.parameter.PageParameters;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueBuildsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueBuildsPage.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueBuildsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
similarity index 97%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueBuildsPage.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
index c8d22455e8..6bdbf735fa 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueBuildsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail;
+package io.onedev.server.web.page.project.issues.detail;
import java.util.ArrayList;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueCommitsPage.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueCommitsPage.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java
index 58400eac5e..6f2495e987 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueCommitsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail;
+package io.onedev.server.web.page.project.issues.detail;
import java.util.List;
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/detail/IssueDetailPage.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
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/detail/IssueDetailPage.java
similarity index 97%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index 9d8b07b05c..f2c99f75d1 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/detail/IssueDetailPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail;
+package io.onedev.server.web.page.project.issues.detail;
import java.util.ArrayList;
import java.util.Collection;
@@ -44,8 +44,8 @@ import io.onedev.server.web.component.tabbable.PageTabLink;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.ProjectPage;
-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.project.issues.create.NewIssuePage;
+import io.onedev.server.web.page.project.issues.list.IssueListPage;
import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailResourceReference.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java
index cc054d97d8..ab98d4f013 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail;
+package io.onedev.server.web.page.project.issues.detail;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssuePullRequestsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssuePullRequestsPage.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssuePullRequestsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java
similarity index 90%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssuePullRequestsPage.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java
index 7e743c3b74..34a74dcf94 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssuePullRequestsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuedetail;
+package io.onedev.server.web.page.project.issues.detail;
import org.apache.wicket.request.mapper.parameter.PageParameters;
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/detail/issue-detail.css
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.js b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.js
rename to core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js
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/list/IssueListPage.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
rename to core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.html
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/list/IssueListPage.java
similarity index 99%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java
index 74f5190239..a3426f94df 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/list/IssueListPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuelist;
+package io.onedev.server.web.page.project.issues.list;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/NamedIssueQueriesBean.java b/core/src/main/java/io/onedev/server/web/page/project/issues/list/NamedIssueQueriesBean.java
similarity index 92%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/NamedIssueQueriesBean.java
rename to core/src/main/java/io/onedev/server/web/page/project/issues/list/NamedIssueQueriesBean.java
index bcf8af175d..1481832e6b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/NamedIssueQueriesBean.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/list/NamedIssueQueriesBean.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.issuelist;
+package io.onedev.server.web.page.project.issues.list;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
index 24f92b0509..a53d291053 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
@@ -14,7 +14,7 @@
</div>
</td>
<td class="action">
- <a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-exchange"></i></a>
+ <a wicket:id="swap" class="swap" title="Swap"><i class="fa fa-arrow-left"></i></a>
</td>
<td class="source branch">
<div class="title">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
index b857b30040..1348b35527 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css
@@ -22,6 +22,12 @@
background: white;
border-top: none;
border-bottom: none;
+ padding-left: 20px;
+ padding-right: 20px;
+}
+#new-request>.body>.branches td.action a {
+ font-size: 18px;
+ color: #666;
}
#new-request>.body>.branches .branch .message {
margin-top: 8px;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index c0fabace36..5e519c58f8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -66,7 +66,7 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.PullRequestActionManager;
+import io.onedev.server.manager.PullRequestChangeManager;
import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.manager.PullRequestUpdateManager;
import io.onedev.server.manager.PullRequestWatchManager;
@@ -246,7 +246,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {
super.onSubmit(target, form);
if (StringUtils.isNotBlank(title)) {
- OneDev.getInstance(PullRequestActionManager.class).changeTitle(getPullRequest(), title, SecurityUtils.getUser());
+ OneDev.getInstance(PullRequestChangeManager.class).changeTitle(getPullRequest(), title, SecurityUtils.getUser());
send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));
isEditingTitle = false;
}
@@ -536,7 +536,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {
@Override
protected void onUpdate(AjaxRequestTarget target) {
- OneDev.getInstance(PullRequestActionManager.class).changeMergeStrategy(getPullRequest(), mergeStrategy, SecurityUtils.getUser());
+ OneDev.getInstance(PullRequestChangeManager.class).changeMergeStrategy(getPullRequest(), mergeStrategy, SecurityUtils.getUser());
send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index f7fe27c8b3..714ee9e5a5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -33,20 +33,26 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
+import io.onedev.server.manager.CodeCommentManager;
+import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.PullRequestCommentManager;
+import io.onedev.server.manager.PullRequestManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestAction;
+import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.PullRequestUpdate;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;
import io.onedev.server.web.component.avatar.AvatarLink;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.ActionActivity;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.CommentedActivity;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.OpenedActivity;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.UpdatedActivity;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestChangeActivity;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestCommentedActivity;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestOpenedActivity;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.activity.PullRequestUpdatedActivity;
import io.onedev.server.web.page.security.LoginPage;
import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
@@ -119,23 +125,37 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
PullRequest request = getPullRequest();
List<PullRequestActivity> activities = new ArrayList<>();
- activities.add(new OpenedActivity(request));
+ activities.add(new PullRequestOpenedActivity(request));
List<PullRequestActivity> otherActivities = new ArrayList<>();
if (showCommits) {
for (PullRequestUpdate update: request.getUpdates())
- otherActivities.add(new UpdatedActivity(update));
+ otherActivities.add(new PullRequestUpdatedActivity(update));
}
if (showComments) {
for (PullRequestComment comment: request.getComments()) {
- otherActivities.add(new CommentedActivity(comment));
+ otherActivities.add(new PullRequestCommentedActivity(comment));
}
}
if (showChangeHistory) {
- for (PullRequestAction action: request.getActions()) {
- otherActivities.add(new ActionActivity(action));
+ for (PullRequestChange change: request.getChanges()) {
+ if (change.getData() instanceof PullRequestReferencedFromIssueData) {
+ PullRequestReferencedFromIssueData referencedFromIssueData = (PullRequestReferencedFromIssueData) change.getData();
+ if (OneDev.getInstance(IssueManager.class).get(referencedFromIssueData.getIssueId()) != null)
+ otherActivities.add(new PullRequestChangeActivity(change));
+ } else if (change.getData() instanceof PullRequestReferencedFromPullRequestData) {
+ PullRequestReferencedFromPullRequestData referencedFromPullRequestData = (PullRequestReferencedFromPullRequestData) change.getData();
+ if (OneDev.getInstance(PullRequestManager.class).get(referencedFromPullRequestData.getRequestId()) != null)
+ otherActivities.add(new PullRequestChangeActivity(change));
+ } else if (change.getData() instanceof PullRequestReferencedFromCodeCommentData) {
+ PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData = (PullRequestReferencedFromCodeCommentData) change.getData();
+ if (OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId()) != null)
+ otherActivities.add(new PullRequestChangeActivity(change));
+ } else {
+ otherActivities.add(new PullRequestChangeActivity(change));
+ }
}
}
@@ -144,7 +164,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
return -1;
else if (o1.getDate().getTime()>o2.getDate().getTime())
return 1;
- else if (o1 instanceof OpenedActivity)
+ else if (o1 instanceof PullRequestOpenedActivity)
return -1;
else
return 1;
@@ -181,7 +201,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
}
if (sinceChangesRow == null && !newActivities.isEmpty()) {
- Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusMillis(1).toDate();
+ Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();
sinceChangesRow = newSinceChangesRow(activitiesView.newChildId(), sinceDate);
activitiesView.add(sinceChangesRow);
String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
@@ -201,7 +221,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
partialPageRequestHandler.prependJavaScript(script);
partialPageRequestHandler.add(newActivityRow);
- if (activity instanceof UpdatedActivity) {
+ if (activity instanceof PullRequestUpdatedActivity) {
partialPageRequestHandler.appendJavaScript("$('tr.since-changes').addClass('visible');");
}
prevActivityRow = newActivityRow;
@@ -298,10 +318,10 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
}
if (!oldActivities.isEmpty() && !newActivities.isEmpty()) {
- Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusMillis(1).toDate();
+ Date sinceDate = new DateTime(newActivities.iterator().next().getDate()).minusSeconds(1).toDate();
Component row = newSinceChangesRow(activitiesView.newChildId(), sinceDate);
for (PullRequestActivity activity: newActivities) {
- if (activity instanceof UpdatedActivity) {
+ if (activity instanceof PullRequestUpdatedActivity) {
row.add(AttributeAppender.append("class", "visible"));
break;
}
@@ -368,7 +388,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
@SuppressWarnings("deprecation")
Component lastActivityRow = activitiesView.get(activitiesView.size()-1);
- Component newActivityRow = newActivityRow(activitiesView.newChildId(), new CommentedActivity(comment));
+ Component newActivityRow = newActivityRow(activitiesView.newChildId(), new PullRequestCommentedActivity(comment));
activitiesView.add(newActivityRow);
String script = String.format("$(\"<tr id='%s'></tr>\").insertAfter('#%s');",
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/ActionActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/ActionActivity.java
deleted file mode 100644
index 47c763a8aa..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/ActionActivity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-
-import java.util.Date;
-
-import org.apache.wicket.Component;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.PullRequestActionManager;
-import io.onedev.server.model.PullRequestAction;
-import io.onedev.server.model.User;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
-import io.onedev.server.web.util.DeleteCallback;
-
-@SuppressWarnings("serial")
-public class ActionActivity implements PullRequestActivity {
-
- private final Long actionId;
-
- public ActionActivity(PullRequestAction action) {
- actionId = action.getId();
- }
-
- @Override
- public Component render(String panelId, DeleteCallback callback) {
- return getAction().getData().render(panelId, getAction());
- }
-
- private PullRequestAction getAction() {
- return OneDev.getInstance(PullRequestActionManager.class).load(actionId);
- }
-
- @Override
- public Date getDate() {
- return getAction().getDate();
- }
-
- @Override
- public String getAnchor() {
- return getAction().getAnchor();
- }
-
- @Override
- public User getUser() {
- return User.getForDisplay(getAction().getUser(), getAction().getUserName());
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/ActionDataPanel.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/ActionDataPanel.html
deleted file mode 100644
index 6a321dc2a4..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/ActionDataPanel.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<wicket:panel>
- <wicket:container wicket:id="content"></wicket:container>
- <wicket:fragment wicket:id="withCommentOrDiffFrag">
- <div class="head">
- <a wicket:id="user"></a> <span wicket:id="action"></span> <span wicket:id="age"></span>
- <a wicket:id="changes" class="changes" title="Changes since this action"><i class="fa fa-ext fa-file-diff"></i></a>
- </div>
- <div class="body">
- <div wicket:id="comment" class="comment"></div>
- <div wicket:id="diff" class="diff"></div>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="withoutCommentAndDiffFrag">
- <div class="content">
- <a wicket:id="user"></a> <span wicket:id="action"></span> <span wicket:id="age"></span>
- <a wicket:id="changes" class="changes" title="Changes since this action"><i class="fa fa-ext fa-file-diff"></i></a>
- </div>
- </wicket:fragment>
-</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/ActionDataPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/ActionDataPanel.java
deleted file mode 100644
index dbf1c09075..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/ActionDataPanel.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.PullRequestActionManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestAction;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.DiffSupport;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-import io.onedev.server.web.component.link.UserLink;
-import io.onedev.server.web.component.markdown.AttachmentSupport;
-import io.onedev.server.web.component.markdown.ContentVersionSupport;
-import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;
-import io.onedev.server.web.util.DeleteCallback;
-import io.onedev.server.web.util.ProjectAttachmentSupport;
-
-@SuppressWarnings("serial")
-public abstract class ActionDataPanel extends Panel {
-
- private static final String COMMENT_ID = "comment";
-
- private static final String DIFF_ID = "diff";
-
- public ActionDataPanel(String id) {
- super(id);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Fragment fragment;
- if (getAction().getData().getCommentSupport() != null || getAction().getData().getDiffSupport() != null) {
- fragment = new Fragment("content", "withCommentOrDiffFrag", this);
- if (getAction().getData().getCommentSupport() != null) {
- fragment.add(new ProjectCommentPanel(COMMENT_ID) {
-
- @Override
- protected String getComment() {
- return getAction().getData().getCommentSupport().getComment();
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, String comment) {
- getAction().getData().getCommentSupport().setComment(comment);
- OneDev.getInstance(PullRequestActionManager.class).save(getAction());
- }
-
- @Override
- protected Project getProject() {
- return getAction().getRequest().getTargetProject();
- }
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getAction().getRequest().getUUID());
- }
-
- @Override
- protected boolean canModifyOrDeleteComment() {
- return SecurityUtils.canModifyOrDelete(getAction());
- }
-
- @Override
- protected String getRequiredLabel() {
- return null;
- }
-
- @Override
- protected ContentVersionSupport getContentVersionSupport() {
- return null;
- }
-
- @Override
- protected DeleteCallback getDeleteCallback() {
- return null;
- }
-
- });
- } else {
- fragment.add(new WebMarkupContainer(COMMENT_ID).setVisible(false));
- }
- DiffSupport diffSupport = getAction().getData().getDiffSupport();
- if (diffSupport != null) {
- fragment.add(new PlainDiffPanel(DIFF_ID,
- diffSupport.getOldLines(), diffSupport.getOldFileName(),
- diffSupport.getNewLines(), diffSupport.getNewFileName(),
- true));
- } else {
- fragment.add(new WebMarkupContainer(DIFF_ID).setVisible(false));
- }
- } else {
- fragment = new Fragment("content", "withoutCommentAndDiffFrag", this);
- }
- User user = User.getForDisplay(getAction().getUser(), getAction().getUserName());
- if (user != null)
- fragment.add(new UserLink("user", user));
- else
- fragment.add(new WebMarkupContainer("user").setVisible(false));
-
- fragment.add(new Label("action", getAction().getData().getDescription()));
- fragment.add(new Label("age", DateUtils.formatAge(getAction().getDate())));
- fragment.add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {
-
- @Override
- public PullRequest getObject() {
- return getAction().getRequest();
- }
-
- }, getAction().getDate()));
-
- add(fragment);
- }
-
- protected abstract PullRequestAction getAction();
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.html
new file mode 100644
index 0000000000..760ff915fe
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.html
@@ -0,0 +1,6 @@
+<wicket:panel>
+ <div class="diff-and-comment-aware">
+ <div wicket:id="diff"></div>
+ <div wicket:id="comment"></div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java
new file mode 100644
index 0000000000..74cc7b3f83
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java
@@ -0,0 +1,95 @@
+package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.PullRequestChangeManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.diff.DiffSupport;
+import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
+import io.onedev.server.web.component.markdown.AttachmentSupport;
+import io.onedev.server.web.component.markdown.ContentVersionSupport;
+import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
+import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.web.util.ProjectAttachmentSupport;
+
+@SuppressWarnings("serial")
+public abstract class DiffAndCommentAwarePanel extends Panel {
+
+ private static final String DIFF_ID = "diff";
+
+ private static final String COMMENT_ID = "comment";
+
+ public DiffAndCommentAwarePanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ DiffSupport diffSupport = getDiffSupport();
+ if (diffSupport != null)
+ add(new PlainDiffPanel(DIFF_ID, diffSupport.getOldLines(), diffSupport.getOldFileName(), diffSupport.getNewLines(), diffSupport.getNewFileName(), true));
+ else
+ add(new WebMarkupContainer(DIFF_ID).setVisible(false));
+
+ if (getChange().getData().getCommentSupport() != null) {
+ add(new ProjectCommentPanel(COMMENT_ID) {
+
+ @Override
+ protected String getComment() {
+ return getChange().getData().getCommentSupport().getComment();
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, String comment) {
+ getChange().getData().getCommentSupport().setComment(comment);
+ OneDev.getInstance(PullRequestChangeManager.class).save(getChange());
+ }
+
+ @Override
+ protected Project getProject() {
+ return getChange().getRequest().getTargetProject();
+ }
+
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(getProject(), getChange().getRequest().getUUID());
+ }
+
+ @Override
+ protected boolean canModifyOrDeleteComment() {
+ return SecurityUtils.canModifyOrDelete(getChange());
+ }
+
+ @Override
+ protected String getRequiredLabel() {
+ return null;
+ }
+
+ @Override
+ protected ContentVersionSupport getContentVersionSupport() {
+ return null;
+ }
+
+ @Override
+ protected DeleteCallback getDeleteCallback() {
+ return null;
+ }
+
+ });
+ } else {
+ add(new WebMarkupContainer(COMMENT_ID).setVisible(false));
+ }
+ }
+
+ protected abstract PullRequestChange getChange();
+
+ protected abstract DiffSupport getDiffSupport();
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
new file mode 100644
index 0000000000..df4db424bb
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
@@ -0,0 +1,55 @@
+package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
+
+import java.util.Date;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.PullRequestChangeManager;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.User;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
+import io.onedev.server.web.util.DeleteCallback;
+
+@SuppressWarnings("serial")
+public class PullRequestChangeActivity implements PullRequestActivity {
+
+ private final Long changeId;
+
+ public PullRequestChangeActivity(PullRequestChange change) {
+ changeId = change.getId();
+ }
+
+ @Override
+ public Component render(String panelId, DeleteCallback callback) {
+ return new PullRequestChangePanel(panelId, new LoadableDetachableModel<PullRequestChange>() {
+
+ @Override
+ protected PullRequestChange load() {
+ return getChange();
+ }
+
+ });
+ }
+
+ private PullRequestChange getChange() {
+ return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
+ }
+
+ @Override
+ public Date getDate() {
+ return getChange().getDate();
+ }
+
+ @Override
+ public String getAnchor() {
+ return getChange().getAnchor();
+ }
+
+ @Override
+ public User getUser() {
+ return User.getForDisplay(getChange().getUser(), getChange().getUserName());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
new file mode 100644
index 0000000000..e3db15cb8e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
@@ -0,0 +1,7 @@
+<wicket:panel>
+ <div class="head">
+ <span wicket:id="user" class="user"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>
+ <a wicket:id="changes" class="changes" title="Changes since this action"><i class="fa fa-ext fa-file-diff"></i></a>
+ </div>
+ <div wicket:id="body" class="body"></div>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
new file mode 100644
index 0000000000..44a03ec4b4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
@@ -0,0 +1,47 @@
+package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.User;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;
+
+@SuppressWarnings("serial")
+class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
+
+ public PullRequestChangePanel(String id, IModel<PullRequestChange> model) {
+ super(id, model);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ PullRequestChange change = getModelObject();
+ User userForDisplay = User.getForDisplay(change.getUser(), change.getUserName());
+ add(new UserLink("user", userForDisplay).setVisible(userForDisplay != null));
+ add(new Label("description", change.getData().getDescription()));
+ add(new Label("age", DateUtils.formatAge(change.getDate())));
+ add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {
+
+ @Override
+ public PullRequest getObject() {
+ return getChange().getRequest();
+ }
+
+ }, getChange().getDate()));
+
+ add(change.getData().render("body", change));
+ }
+
+ private PullRequestChange getChange() {
+ return getModelObject();
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/CommentedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
similarity index 85%
rename from core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/CommentedActivity.java
rename to core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
index 1067396485..3cece18157 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/CommentedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
@@ -14,17 +14,17 @@ import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequ
import io.onedev.server.web.util.DeleteCallback;
@SuppressWarnings("serial")
-public class CommentedActivity implements PullRequestActivity {
+public class PullRequestCommentedActivity implements PullRequestActivity {
private final Long commentId;
- public CommentedActivity(PullRequestComment comment) {
+ public PullRequestCommentedActivity(PullRequestComment comment) {
commentId = comment.getId();
}
@Override
public Component render(String componentId, DeleteCallback deleteCallback) {
- return new CommentedPanel(componentId, new LoadableDetachableModel<PullRequestComment>() {
+ return new PullRequestCommentedPanel(componentId, new LoadableDetachableModel<PullRequestComment>() {
@Override
protected PullRequestComment load() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/CommentedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/CommentedPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/CommentedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
similarity index 76%
rename from core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/CommentedPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
index 0d414d5033..b7af3566b6 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/CommentedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
@@ -23,11 +23,11 @@ import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
-class CommentedPanel extends GenericPanel<PullRequestComment> {
+class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
private final DeleteCallback deleteCallback;
- public CommentedPanel(String id, IModel<PullRequestComment> model, DeleteCallback deleteCallback) {
+ public PullRequestCommentedPanel(String id, IModel<PullRequestComment> model, DeleteCallback deleteCallback) {
super(id, model);
this.deleteCallback = deleteCallback;
}
@@ -52,29 +52,29 @@ class CommentedPanel extends GenericPanel<PullRequestComment> {
@Override
protected String getComment() {
- return CommentedPanel.this.getComment().getContent();
+ return PullRequestCommentedPanel.this.getComment().getContent();
}
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
- CommentedPanel.this.getComment().setContent(comment);
- OneDev.getInstance(PullRequestCommentManager.class).save(CommentedPanel.this.getComment());
+ PullRequestCommentedPanel.this.getComment().setContent(comment);
+ OneDev.getInstance(PullRequestCommentManager.class).save(PullRequestCommentedPanel.this.getComment());
}
@Override
protected Project getProject() {
- return CommentedPanel.this.getComment().getProject();
+ return PullRequestCommentedPanel.this.getComment().getProject();
}
@Override
protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(CommentedPanel.this.getComment().getProject(),
- CommentedPanel.this.getComment().getRequest().getUUID());
+ return new ProjectAttachmentSupport(PullRequestCommentedPanel.this.getComment().getProject(),
+ PullRequestCommentedPanel.this.getComment().getRequest().getUUID());
}
@Override
protected boolean canModifyOrDeleteComment() {
- return SecurityUtils.canModifyOrDelete(CommentedPanel.this.getComment());
+ return SecurityUtils.canModifyOrDelete(PullRequestCommentedPanel.this.getComment());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/OpenedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/OpenedActivity.java
rename to core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java
index e49a7711a2..436ec3eb06 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/OpenedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java
@@ -13,17 +13,17 @@ import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequ
import io.onedev.server.web.util.DeleteCallback;
@SuppressWarnings("serial")
-public class OpenedActivity implements PullRequestActivity {
+public class PullRequestOpenedActivity implements PullRequestActivity {
private final Long requestId;
- public OpenedActivity(PullRequest request) {
+ public PullRequestOpenedActivity(PullRequest request) {
requestId = request.getId();
}
@Override
public Component render(String componentId, DeleteCallback deleteCallback) {
- return new OpenedPanel(componentId, new LoadableDetachableModel<PullRequest>() {
+ return new PullRequestOpenedPanel(componentId, new LoadableDetachableModel<PullRequest>() {
@Override
protected PullRequest load() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/OpenedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/OpenedPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/OpenedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
similarity index 82%
rename from core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/OpenedPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
index 3717722f76..b22ff097d9 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/OpenedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
@@ -1,12 +1,13 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.event.Broadcast;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.PullRequestManager;
+import io.onedev.server.manager.PullRequestChangeManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
@@ -18,11 +19,12 @@ import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
import io.onedev.server.web.util.DeleteCallback;
import io.onedev.server.web.util.ProjectAttachmentSupport;
+import io.onedev.server.web.websocket.PageDataChanged;
@SuppressWarnings("serial")
-class OpenedPanel extends GenericPanel<PullRequest> {
+class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
- public OpenedPanel(String id, IModel<PullRequest> model) {
+ public PullRequestOpenedPanel(String id, IModel<PullRequest> model) {
super(id, model);
}
@@ -43,8 +45,8 @@ class OpenedPanel extends GenericPanel<PullRequest> {
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
- getPullRequest().setDescription(comment);
- OneDev.getInstance(PullRequestManager.class).save(getPullRequest());
+ OneDev.getInstance(PullRequestChangeManager.class).changeDescription(getPullRequest(), comment, SecurityUtils.getUser());
+ send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/UpdatedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java
similarity index 82%
rename from core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/UpdatedActivity.java
rename to core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java
index 7a2ebf3968..0fa8223dae 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/UpdatedActivity.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedActivity.java
@@ -13,17 +13,17 @@ import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequ
import io.onedev.server.web.util.DeleteCallback;
@SuppressWarnings("serial")
-public class UpdatedActivity implements PullRequestActivity {
+public class PullRequestUpdatedActivity implements PullRequestActivity {
private final Long updateId;
- public UpdatedActivity(PullRequestUpdate update) {
+ public PullRequestUpdatedActivity(PullRequestUpdate update) {
updateId = update.getId();
}
@Override
public Component render(String componentId, DeleteCallback deleteCallback) {
- return new UpdatedPanel(componentId, new LoadableDetachableModel<PullRequestUpdate>() {
+ return new PullRequestUpdatedPanel(componentId, new LoadableDetachableModel<PullRequestUpdate>() {
@Override
protected PullRequestUpdate load() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/UpdatedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/UpdatedPanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/UpdatedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
similarity index 97%
rename from core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/UpdatedPanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
index b0f03f38cd..c1269449bb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/UpdatedPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java
@@ -35,9 +35,9 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
@SuppressWarnings("serial")
-class UpdatedPanel extends GenericPanel<PullRequestUpdate> {
+class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {
- public UpdatedPanel(String id, IModel<PullRequestUpdate> model) {
+ public PullRequestUpdatedPanel(String id, IModel<PullRequestUpdate> model) {
super(id, model);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
index 5c615d56a9..e57efe19de 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
@@ -28,29 +28,29 @@
#request-detail>.main>.activities .activity>td.content {
padding-left: 20px;
}
-#request-detail>.main>.activities .UpdatedActivity>td.content .alert {
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content .alert {
margin: 16px 0;
}
-#request-detail>.main>.activities .UpdatedActivity>td.content td {
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td {
color: #888;
padding: 4px 0;
}
-#request-detail>.main>.activities .UpdatedActivity>td.content tr:hover td {
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content tr:hover td {
background: #F5F5F5;
}
-#request-detail>.main>.activities .UpdatedActivity>td.content td.icon {
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.icon {
width: 30px;
}
-#request-detail>.main>.activities .UpdatedActivity>td.content td.author {
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.author {
width: 35px;
}
-#request-detail>.main>.activities .UpdatedActivity>td.content td.hash-and-status {
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.hash-and-status {
width: 160px;
}
-#request-detail>.main>.activities .UpdatedActivity>td.content td.hash-and-status>div {
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content td.hash-and-status>div {
margin-left: 8px;
}
-#request-detail>.main>.activities .UpdatedActivity>td.content a {
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content a {
color: #555;
}
@@ -73,6 +73,9 @@
#request-detail>.main>.activities .activity>td>.body {
margin-top: 8px;
}
+#request-detail>.main>.activities .activity>td>.body>.referenced-from .label {
+ line-height: inherit;
+}
#request-detail>.main>.activities .add-comment {
margin-top: 16px;
}
@@ -106,9 +109,5 @@
margin-right: 4px;
}
#request-detail>.main>.activities .activity>td.content .plain.diff {
- border: none;
-}
-#request-detail>.main>.activities .activity>td.content .plain.diff td {
- padding: 0;
- background: white;
+ margin-bottom: 12px;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html
index dc84295164..3b3876e3a4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html
@@ -26,9 +26,4 @@
<wicket:fragment wicket:id="sourceFrag">
<a wicket:id="link"></a>
</wicket:fragment>
- <wicket:fragment wicket:id="lastActivityFrag">
- <span wicket:id="user"></span>
- <span wicket:id="description"></span>
- <span wicket:id="date"></span>
- </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
index f7ea7e109e..eb5b8dda38 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
@@ -387,18 +387,12 @@ public class PullRequestListPage extends ProjectPage {
});
- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Last Activity")) {
+ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Last Update")) {
@Override
public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {
PullRequest request = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "lastActivityFrag", PullRequestListPage.this);
- fragment.add(new Label("user", request.getLastActivity().getUserName()).setVisible(request.getLastActivity().getUserName()!=null));
-
- fragment.add(new Label("description", request.getLastActivity().getDescription()));
- fragment.add(new Label("date", DateUtils.formatAge(request.getLastActivity().getDate())));
-
- cellItem.add(fragment);
+ cellItem.add(new Label(componentId, DateUtils.formatAge(request.getUpdateDate())));
}
});
@@ -469,7 +463,7 @@ public class PullRequestListPage extends ProjectPage {
Item<PullRequest> item = super.newRowItem(id, index, model);
PullRequest request = model.getObject();
item.add(AttributeAppender.append("class",
- request.isVisitedAfter(request.getLastActivity().getDate())?"request":"request new"));
+ request.isVisitedAfter(request.getUpdateDate())?"request":"request new"));
return item;
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
index ede9c4278c..70a75158d2 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
@@ -33,8 +33,8 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
import io.onedev.server.model.Project;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.model.support.WatchStatus;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.watch.WatchStatus;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.subscriptionstatus.SubscriptionStatusLink;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java
index 4bff382ce5..4e1286bb05 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java
@@ -15,8 +15,8 @@ import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.IssueConstants;
import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
+import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.BeanContext;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.html b/core/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.html
new file mode 100644
index 0000000000..888f0065d6
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <table wicket:id="table" class="table table-condensed"></table>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.java b/core/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.java
new file mode 100644
index 0000000000..0ca9a16c7c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.java
@@ -0,0 +1,107 @@
+package io.onedev.server.web.page.project.stats;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.WebConstants;
+
+@SuppressWarnings("serial")
+class ContributionListPanel extends Panel {
+
+ public ContributionListPanel(String id, IModel<List<DayContribution>> contributionsModel) {
+ super(id, contributionsModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<DayContribution, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<DayContribution, Void>(Model.of("Date")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<DayContribution>> cellItem, String componentId,
+ IModel<DayContribution> rowModel) {
+ cellItem.add(new Label(componentId, DateUtils.formatDate(rowModel.getObject().getDay().getDate())));
+ }
+ });
+
+ columns.add(new AbstractColumn<DayContribution, Void>(Model.of("Commits")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<DayContribution>> cellItem, String componentId,
+ IModel<DayContribution> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getContribution().getCommits()));
+ }
+ });
+
+ columns.add(new AbstractColumn<DayContribution, Void>(Model.of("Additions")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<DayContribution>> cellItem, String componentId,
+ IModel<DayContribution> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getContribution().getAdditions()));
+ }
+ });
+
+ columns.add(new AbstractColumn<DayContribution, Void>(Model.of("Deletions")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<DayContribution>> cellItem, String componentId,
+ IModel<DayContribution> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getContribution().getDeletions()));
+ }
+ });
+
+ SortableDataProvider<DayContribution, Void> dataProvider = new SortableDataProvider<DayContribution, Void>() {
+
+ @Override
+ public Iterator<? extends DayContribution> iterator(long first, long count) {
+ if (first + count <= getContribution().size())
+ return getContribution().subList((int)first, (int)(first+count)).iterator();
+ else
+ return getContribution().subList((int)first, getContribution().size()).iterator();
+ }
+
+ @Override
+ public long size() {
+ return getContribution().size();
+ }
+
+ @Override
+ public IModel<DayContribution> model(DayContribution object) {
+ return Model.of(object);
+ }
+ };
+
+ DataTable<DayContribution, Void> contributionTable =
+ new DataTable<DayContribution, Void>("table", columns, dataProvider, WebConstants.PAGE_SIZE);
+
+ contributionTable.addTopToolbar(new HeadersToolbar<>(contributionTable, dataProvider));
+ contributionTable.addBottomToolbar(new AjaxNavigationToolbar(contributionTable));
+ contributionTable.setOutputMarkupId(true);
+ add(contributionTable);
+ }
+
+ @SuppressWarnings("unchecked")
+ private List<DayContribution> getContribution() {
+ return (List<DayContribution>) getDefaultModelObject();
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
index 2f07625504..de315dcb58 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
@@ -43,6 +43,8 @@ import io.onedev.server.web.component.link.UserLink;
@SuppressWarnings("serial")
public class ProjectContribsPage extends ProjectStatsPage {
+ private final int NUM_CONTRIBUTORS = 25;
+
private final IModel<List<DayContribution>> overallContributionsModel =
new LoadableDetachableModel<List<DayContribution>>() {
@@ -58,6 +60,8 @@ public class ProjectContribsPage extends ProjectStatsPage {
private String toDayText;
+// private int gap;
+
private int commits;
private int additions;
@@ -131,6 +135,7 @@ public class ProjectContribsPage extends ProjectStatsPage {
@Override
public String getObject() {
+ // TODO Auto-generated method stub
Day fromDay;
if (StringUtils.isNotBlank(fromDayText)) {
fromDay = new Day(Constants.DATE_FORMATTER.parseDateTime(fromDayText));
@@ -163,6 +168,7 @@ public class ProjectContribsPage extends ProjectStatsPage {
@Override
protected void onUpdate(AjaxRequestTarget target) {
+ //System.out.println("#########"+fromDayText+toDayText);
target.add(overallContributorsContainer);
target.add(topContributorsContainer);
}
@@ -180,6 +186,7 @@ public class ProjectContribsPage extends ProjectStatsPage {
String today = RequestCycle.get().getRequest().getRequestParameters().getParameterValue("today").toString();
fromDayText=fromday.replaceAll("/", "-");
toDayText=today.replaceAll("/", "-");
+ //System.out.println("<<<<<<<<"+fromDayText+toDayText);
_target.add(topContributorsContainer);
_target.add(timeZoomContainer);
}
@@ -190,6 +197,11 @@ public class ProjectContribsPage extends ProjectStatsPage {
@Override
protected void respond(AjaxRequestTarget target) {
+ String fromday = RequestCycle.get().getRequest().getRequestParameters().getParameterValue("fromday").toString();
+ String today = RequestCycle.get().getRequest().getRequestParameters().getParameterValue("today").toString();
+ fromDayText=fromday.replaceAll("/", "-");
+ toDayText=today.replaceAll("/", "-");
+ //System.out.println("<<<<<<<<"+fromDayText+toDayText);
target.add(overallContributorsContainer);
}
};
@@ -203,8 +215,24 @@ public class ProjectContribsPage extends ProjectStatsPage {
public void renderHead(Component component, IHeaderResponse response) {
super.renderHead(component, response);
String jsonContributionList = getJson(OverallContributions);
- String script = String.format("onedev.server.stats.contribs.onDomReady(%s,'%s','%s','%s');",jsonContributionList,
- orderBy,fromDayText,toDayText
+
+ Day fromDay;
+ if (StringUtils.isNotBlank(fromDayText)) {
+ fromDay = new Day(Constants.DATE_FORMATTER.parseDateTime(fromDayText));
+ } else {
+ fromDay = OverallContributions.get(0).getDay();
+ }
+
+ Day toDay;
+ if (StringUtils.isNotBlank(toDayText)) {
+ toDay = new Day(Constants.DATE_FORMATTER.parseDateTime(toDayText));
+ } else {
+ toDay = OverallContributions.get(OverallContributions.size()-1).getDay();
+ }
+ int gapday=(int)((toDay.getDate().getTime()-fromDay.getDate().getTime())/ (1000*3600*24));
+ //System.out.println(">>>>>>startday"+fromDayText+" " + "today"+toDayText);
+ String script = String.format("onedev.server.stats.contribs.onDomReady(%s,'%s','%s','%s','%d');",jsonContributionList,
+ orderBy,fromDayText,toDayText,gapday
)
;
response.render(OnDomReadyHeaderItem.forScript(script));
@@ -243,7 +271,7 @@ public class ProjectContribsPage extends ProjectStatsPage {
}
return OneDev.getInstance(CommitInfoManager.class)
- .getTopContributors(getProject(), 100, Contribution.Type.valueOf(orderBy), fromDay, toDay);
+ .getTopContributors(getProject(), NUM_CONTRIBUTORS, Contribution.Type.valueOf(orderBy), fromDay, toDay);
} else {
return new ArrayList<>();
}
@@ -275,6 +303,8 @@ public class ProjectContribsPage extends ProjectStatsPage {
@Override
protected void respond(AjaxRequestTarget target) {
+ // TODO Auto-generated method stub
+
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java
index 6a01e76d98..60cf18e8bb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
-import io.onedev.server.web.asset.chart.EChartsResourceReference;
+import io.onedev.server.web.asset.echarts.EChartsResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class ProjectStatsResourceReference extends BaseDependentResourceReference {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
index a1a7d53686..dfc86a49f5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
@@ -1,93 +1,335 @@
onedev.server.stats = {
contribs : {
- onDomReady : function(jsonList, orderBy, fromDay, toDay) {
- var date = [];
- var data = [];
- var base = +new Date(jsonList[0].day.dateTime);
- var oneDay = 24 * 3600 * 1000;
- var firstday = new Date(jsonList[0].day.dateTime);
+ onDomReady : function(jsonList, orderBy, fromDay, toDay, gapday) {
- date.push([ firstday.getFullYear(), firstday.getMonth() + 1, firstday.getDate() ].join('/'));
+ //console.log(">>>>>>>>>>gapday:",gapday,"fromDay:",fromDay,"toDay",toDay);
+ var flag = false;
+ function getDailyData(list) {
+ //var dailyData=[];
+ var date = [];
+ var data = [];
+ var base = +new Date(list[0].day.dateTime);
+ var oneDay = 24 * 3600 * 1000;
+ var firstday = new Date(list[0].day.dateTime);
- if (orderBy == "COMMITS") {
- data.push(jsonList[0].contribution.commits);
- for (var i = 1; i < jsonList.length; i++) {
- var day = new Date(jsonList[i].day.dateTime);
- var now = new Date(base += oneDay);
- while (day.getTime() != now.getTime()) {
+ date.push([ firstday.getFullYear(), firstday.getMonth() + 1, firstday.getDate() ].join('/'));
+
+ if (orderBy == "COMMITS") {
+ data.push(list[0].contribution.commits);
+ for (var i = 1; i < list.length; i++) {
+ var day = new Date(list[i].day.dateTime);
+ var now = new Date(base += oneDay);
+ while (day.getTime() != now.getTime()) {
+ date.push([ now.getFullYear(), now.getMonth() + 1, now.getDate() ].join('/'));
+ data.push(0);
+ now = new Date(base += oneDay);
+
+ }
date.push([ now.getFullYear(), now.getMonth() + 1, now.getDate() ].join('/'));
- data.push(0);
- now = new Date(base += oneDay);
+ data.push(list[i].contribution.commits);
+ }
+ } else if (orderBy == "ADDITIONS") {
+ data.push(list[0].contribution.additions / 1000);
+ for (var i = 1; i < list.length; i++) {
+ var day = new Date(list[i].day.dateTime);
+ var now = new Date(base += oneDay);
+ while (day.getTime() != now.getTime()) {
+ date.push([ now.getFullYear(), now.getMonth() + 1, now.getDate() ].join('/'));
+ data.push(0);
+ now = new Date(base += oneDay);
+ }
+ date.push([ now.getFullYear(), now.getMonth() + 1, now.getDate() ].join('/'));
+ data.push(list[i].contribution.additions / 1000);
}
- date.push([ now.getFullYear(), now.getMonth() + 1, now.getDate() ].join('/'));
- data.push(jsonList[i].contribution.commits);
- }
- } else if (orderBy == "ADDITIONS") {
- data.push(jsonList[0].contribution.additions / 1000);
- for (var i = 1; i < jsonList.length; i++) {
- var day = new Date(jsonList[i].day.dateTime);
- var now = new Date(base += oneDay);
- while (day.getTime() != now.getTime()) {
+
+ } else {
+ data.push(list[0].contribution.deletions / 1000);
+ for (var i = 1; i < list.length; i++) {
+ var day = new Date(list[i].day.dateTime);
+ var now = new Date(base += oneDay);
+ while (day.getTime() != now.getTime()) {
+ date.push([ now.getFullYear(), now.getMonth() + 1, now.getDate() ].join('/'));
+ data.push(0);
+ now = new Date(base += oneDay);
+
+ }
date.push([ now.getFullYear(), now.getMonth() + 1, now.getDate() ].join('/'));
- data.push(0);
- now = new Date(base += oneDay);
+ data.push(list[i].contribution.deletions / 1000);
+ }
+ }
+ data = data.concat(date);
+ return data;
+ }
+ /*get Whole Monthly Data from jsonList*/
+ function getMonthData(list) {
+ var monthdate = [];
+ var monthdata = [];
+ var MONTH = new Array("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
+ var lastDay = new Date(list[0].day.dateTime);
+ if (orderBy == "COMMITS") {
+ var monthCommits = list[0].contribution.commits;
+ if (list.length == 1) {
+ monthdate.push([ lastDay.getFullYear(), MONTH[lastDay.getMonth()] ].join('/'));
+ monthdata.push(monthCommits);
}
- date.push([ now.getFullYear(), now.getMonth() + 1, now.getDate() ].join('/'));
- data.push(jsonList[i].contribution.additions / 1000);
+ for (var i = 1; i < list.length; i++) {
+ var monthNo = lastDay.getMonth();
+ var currentDay = new Date(list[i].day.dateTime);
+ var current_monthNo = currentDay.getMonth();
+ if (lastDay.getFullYear() == currentDay.getFullYear() && monthNo == current_monthNo) {
+ monthCommits += list[i].contribution.commits;
+ if (i == list.length - 1) {
+ monthdate.push([ lastDay.getFullYear(), MONTH[lastDay.getMonth()] ].join('/'));
+ monthdata.push(monthCommits);
+ break;
+ }
+ } else {
+ monthdate.push([ lastDay.getFullYear(), MONTH[lastDay.getMonth()] ].join('/'));
+ monthdata.push(monthCommits);
+
+ var monthgap = (currentDay.getFullYear() * 12 + currentDay.getMonth()) - (lastDay.getFullYear() * 12 + lastDay.getMonth());
+ if (monthgap >= 2) {
+ var curr = lastDay;
+ curr.setMonth(curr.getMonth() + 1);
+ while (curr <= currentDay) {
+ if (curr.getFullYear() == currentDay.getFullYear() && curr.getMonth() == currentDay.getMonth()) break;
+ var month = curr.getMonth();
+ monthdate.push([ curr.getFullYear(), MONTH[month] ].join('/'));
+ monthdata.push(0);
+ curr.setMonth(month + 1);
+ }
+ }
+
+ monthCommits = list[i].contribution.commits;
+ lastDay = new Date(list[i].day.dateTime);
+ if (i == list.length - 1) {
+ monthdate.push([ currentDay.getFullYear(), MONTH[currentDay.getMonth()] ].join('/'));
+ monthdata.push(monthCommits);
+ break;
+ }
+ }
+
+ }
+ } else if (orderBy == "ADDITIONS") {
+ var monthAdditions = list[0].contribution.additions;
+ if (list.length == 1) {
+ monthdate.push([ lastDay.getFullYear(), MONTH[lastDay.getMonth()] ].join('/'));
+ monthdata.push(monthAdditions / 1000);
+ }
+ for (var i = 1; i < list.length; i++) {
+ var monthNo = lastDay.getMonth();
+ var currentDay = new Date(list[i].day.dateTime);
+ var current_monthNo = currentDay.getMonth();
+ if (lastDay.getFullYear() == currentDay.getFullYear() && monthNo == current_monthNo) {
+ monthAdditions += list[i].contribution.additions;
+ if (i == list.length - 1) {
+ monthdate.push([ lastDay.getFullYear(), MONTH[lastDay.getMonth()] ].join('/'));
+ monthdata.push(monthAdditions / 1000);
+ break;
+ }
+ } else {
+ monthdate.push([ lastDay.getFullYear(), MONTH[lastDay.getMonth()] ].join('/'));
+ monthdata.push(monthAdditions / 1000);
+ var monthgap = (currentDay.getFullYear() * 12 + currentDay.getMonth()) - (lastDay.getFullYear() * 12 + lastDay.getMonth());
+ if (monthgap >= 2) {
+ var curr = lastDay;
+ curr.setMonth(curr.getMonth() + 1);
+ while (curr <= currentDay) {
+ if (curr.getFullYear() == currentDay.getFullYear() && curr.getMonth() == currentDay.getMonth()) break;
+ var month = curr.getMonth();
+ monthdate.push([ curr.getFullYear(), MONTH[month] ].join('/'));
+ monthdata.push(0);
+ curr.setMonth(month + 1);
+ }
+ }
+
+ monthAdditions = list[i].contribution.additions;
+ lastDay = new Date(list[i].day.dateTime);
+ if (i == list.length - 1) {
+ monthdate.push([ currentDay.getFullYear(), MONTH[currentDay.getMonth()] ].join('/'));
+ monthdata.push(monthAdditions / 1000);
+ break;
+ }
+ }
+
+ }
+ } else {
+ var monthDeletions = list[0].contribution.deletions;
+ if (list.length == 1) {
+ monthdate.push([ lastDay.getFullYear(), MONTH[lastDay.getMonth()] ].join('/'));
+ monthdata.push(monthDeletions / 1000);
+ }
+ for (var i = 1; i < list.length; i++) {
+ var monthNo = lastDay.getMonth();
+ var currentDay = new Date(list[i].day.dateTime);
+ var current_monthNo = currentDay.getMonth();
+ if (lastDay.getFullYear() == currentDay.getFullYear() && monthNo == current_monthNo) {
+ monthDeletions += list[i].contribution.deletions;
+ if (i == list.length - 1) {
+ monthdate.push([ lastDay.getFullYear(), MONTH[lastDay.getMonth()] ].join('/'));
+ monthdata.push(monthDeletions / 1000);
+ break;
+ }
+ } else {
+ monthdate.push([ lastDay.getFullYear(), MONTH[lastDay.getMonth()] ].join('/'));
+ monthdata.push(monthDeletions / 1000);
+
+ var monthgap = (currentDay.getFullYear() * 12 + currentDay.getMonth()) - (lastDay.getFullYear() * 12 + lastDay.getMonth());
+ if (monthgap >= 2) {
+ var curr = lastDay;
+ curr.setMonth(curr.getMonth() + 1);
+ while (curr <= currentDay) {
+ if (curr.getFullYear() == currentDay.getFullYear() && curr.getMonth() == currentDay.getMonth()) break;
+ var month = curr.getMonth();
+ monthdate.push([ curr.getFullYear(), MONTH[month] ].join('/'));
+ monthdata.push(0);
+ curr.setMonth(month + 1);
+ }
+ }
+
+ monthDeletions = list[i].contribution.deletions;
+ lastDay = new Date(list[i].day.dateTime);
+ if (i == list.length - 1) {
+ monthdate.push([ currentDay.getFullYear(), MONTH[currentDay.getMonth()] ].join('/'));
+ monthdata.push(monthDeletions / 1000);
+ break;
+ }
+ }
+
+ }
+ }
+ monthdata = monthdata.concat(monthdate);
+ return monthdata;
+ }
+ /*get Sliced DailyData from the Whole DailyData*/
+ function getSlicedDailyData(list, fromday, today) {
+ var slicedDate = [];
+ var slicedData = [];
+ for (var i = 0; i < list.length / 2; i++) {
+ slicedData.push(list[i]);
+ }
+ for (var j = list.length / 2; j < list.length; j++) {
+ slicedDate.push(list[j]);
}
- } else {
- data.push(jsonList[0].contribution.deletions / 1000);
- for (var i = 1; i < jsonList.length; i++) {
- var day = new Date(jsonList[i].day.dateTime);
- var now = new Date(base += oneDay);
- while (day.getTime() != now.getTime()) {
- date.push([ now.getFullYear(), now.getMonth() + 1, now.getDate() ].join('/'));
- data.push(0);
- now = new Date(base += oneDay);
+ var firstday,
+ lastday;
+ if (fromday == 'null' && today == 'null') {
+ firstday = 0;
+ lastday = slicedDate.length - 1;
+ } else {
+ fromday = fromday.replace(/-/g, "/");
+ today = today.replace(/-/g, "/");
+ for (var j = 0; j < slicedDate.length; j++) {
+ if (slicedDate[j] == fromday)
+ firstday = j;
+ if (slicedDate[j] == today) {
+ lastday = j;
+ break;
+ }
+ }
+
+ }
+ slicedDate = slicedDate.slice(firstday, lastday + 1);
+ slicedData = slicedData.slice(firstday, lastday + 1);
+ slicedData = slicedData.concat(slicedDate);
+ return slicedData;
+ }
+ /*get Sliced MonthData from the Whole MonthData*/
+ function getSlicedMonthData(list, fromday, today) {
+ //console.log("FUNCTION GETSLICED MONTHDATA",fromday,today)
+ var slicedDate = [];
+ var slicedData = [];
+ var MONTH = new Array("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
+ for (var i = 0; i < list.length / 2; i++) {
+ slicedData.push(list[i]);
+ }
+ for (var j = list.length / 2; j < list.length; j++) {
+ slicedDate.push(list[j]);
+ }
+
+ var firstday,
+ lastday;
+ if (fromday == 'null' && today == 'null') {
+ firstday = 0;
+ lastday = slicedDate.length - 1;
+ } else {
+ fromday = fromday.replace(/-/g, "/");
+ today = today.replace(/-/g, "/");
+ var year_fromday = fromday.split("/")[0];
+ var month_fromday = fromday.split("/")[1];
+ var year_today = today.split("/")[0];
+ var month_today = today.split("/")[1];
+ //console.log("##########year:",year_fromday," month",month_fromday);
+ for (var j = 0; j < slicedDate.length; j++) {
+ var year = slicedDate[j].split("/")[0];
+ var month = slicedDate[j].split("/")[1];
+ if (year == year_fromday && month == MONTH[month_fromday - 1]) {
+ firstday = j;
+ break;
+ }
}
- date.push([ now.getFullYear(), now.getMonth() + 1, now.getDate() ].join('/'));
- data.push(jsonList[i].contribution.deletions / 1000);
+ for (var j = firstday; j < slicedDate.length; j++) {
+ var year = slicedDate[j].split("/")[0];
+ var month = slicedDate[j].split("/")[1];
+ if (year == year_today && month == MONTH[month_today - 1]) {
+ lastday = j;
+ break;
+ }
+ }
+
}
+ slicedDate = slicedDate.slice(firstday, lastday + 1);
+ slicedData = slicedData.slice(firstday, lastday + 1);
+ slicedData = slicedData.concat(slicedDate);
+ return slicedData;
}
+ // console.log("fromDay and toDay",fromDay,"###",toDay);
- var showdate = [];
var showdata = [];
- var firstday,
- lastday;
- if (fromDay == 'null' && toDay == 'null') {
- firstday = 0;
- lastday = date.length - 1;
- } else {
- fromDay = fromDay.replace(/-/g, "/");
- toDay = toDay.replace(/-/g, "/");
- for (var j = 0; j < date.length; j++) {
- if (date[j] == fromDay)
- firstday = j;
- if (date[j] == toDay) {
- lastday = j;
- break;
- }
+ var showdate = [];
+
+ /*get showdata for monthContribution*/
+ if (gapday > 365) {
+ var wholeMonthData = getMonthData(jsonList);
+ var monthData = getSlicedMonthData(wholeMonthData, fromDay, toDay);
+ //console.log("month",monthData);
+ for (var i = 0; i < monthData.length / 2; i++) {
+ showdata.push(monthData[i]);
+ }
+ for (var j = monthData.length / 2; j < monthData.length; j++) {
+ showdate.push(monthData[j]);
}
+ }
+ /*get showdata for dailyContribution*/
+ else {
+ var wholeDailyData = getDailyData(jsonList);
+ var dailyData = getSlicedDailyData(wholeDailyData, fromDay, toDay);
+ for (var i = 0; i < dailyData.length / 2; i++) {
+ showdata.push(dailyData[i]);
+ }
+ for (var j = dailyData.length / 2; j < dailyData.length; j++) {
+ showdate.push(dailyData[j]);
+ }
}
- showdate = date.slice(firstday, lastday + 1);
- showdata = data.slice(firstday, lastday + 1);
- var windowWidth = $(window).width();
+ //console.log("showdata",showdata);
var myChart = echarts.init(document.getElementById('project-contribs'));
+
var optionCommits = {
tooltip : {
trigger : 'axis',
+ // formatter: '{b} <br/>{a}:{c}s',
position : function(pt) {
return [ pt[0], '10%' ];
}
},
title : {
left : 'center',
- text : 'Overall Contribution',
+ text : 'OverallContribution',
},
grid : {
left : "2%",
@@ -103,15 +345,16 @@ onedev.server.stats = {
opacity : 0
}
},
- restore : {
- title: 'Restore date range',
- iconStyle : {
- textPosition : 'left',
- opacity : 0
- }
- },
- },
- right: 40
+ /*restore: {
+ //icon:'path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5C17.6,3.5,6.8,14.4,6.8,27.6c0,13.3,10.8,24.1,24.101,24.1C44.2,51.7,55,40.9,55,27.6C54.9,14.4,44.1,3.5,30.9,3.5z M36.9,35.8c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H36c0.5,0,0.9,0.4,0.9,1V35.8z M27.8,35.8 c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H27c0.5,0,0.9,0.4,0.9,1L27.8,35.8L27.8,35.8z',
+ iconStyle:{
+ textPosition:'left',
+ opacity:1
+ }
+ },*/
+ //saveAsImage: {}
+ }
+ //show:false
},
xAxis : {
type : 'category',
@@ -124,6 +367,9 @@ onedev.server.stats = {
show : false
},
minInterval : 1,
+ /*max: function(value) {
+ return value.max ;
+ },*/
type : 'value',
boundaryGap : [ 0, '100%' ],
triggerEvent : true
@@ -165,20 +411,21 @@ onedev.server.stats = {
}
]
};
+
var optionAdditions = {
tooltip : {
trigger : 'axis',
- formatter : '{b} <br/>{a}: {c}k',
+ formatter : '{b} <br/>{a}:{c}k',
position : function(pt) {
return [ pt[0], '10%' ];
}
},
title : {
left : 'center',
- text : 'Overall Contribution',
+ text : 'OverallContribution',
},
grid : {
- left : "2%",
+ left : "4%",
right : "2%",
top : 60,
buttom : 60
@@ -191,11 +438,13 @@ onedev.server.stats = {
opacity : 0
}
},
- restore : {
- title: 'Restore date range'
- },
- },
- right: 40
+ /*restore: {
+ iconStyle:{
+ opacity:1
+ }
+ },*/
+ //saveAsImage: {}
+ }
},
xAxis : {
type : 'category',
@@ -260,17 +509,17 @@ onedev.server.stats = {
var optionDeletions = {
tooltip : {
trigger : 'axis',
- formatter : '{b} <br/>{a}: {c}k',
+ formatter : '{b} <br/>{a}:{c}k',
position : function(pt) {
return [ pt[0], '10%' ];
}
},
title : {
left : 'center',
- text : 'Overall Contribution',
+ text : 'OverallContribution',
},
grid : {
- left : "2%",
+ left : "4%",
right : "2%",
top : 60,
buttom : 60
@@ -283,11 +532,13 @@ onedev.server.stats = {
opacity : 0
}
},
- restore : {
- title: 'Restore date range'
- },
- },
- right: 40
+ /*restore: {
+ iconStyle:{
+ opacity:1
+ }
+ },*/
+ //saveAsImage: {}
+ }
},
xAxis : {
type : 'category',
@@ -350,46 +601,114 @@ onedev.server.stats = {
]
};
- if (orderBy == "COMMITS") myChart.setOption(optionCommits, true);
- else if (orderBy == "ADDITIONS") myChart.setOption(optionAdditions, true);
- else myChart.setOption(optionDeletions, true);
+ if (orderBy == "COMMITS") {
+ myChart.setOption(optionCommits, true);
+ } else if (orderBy == "ADDITIONS") {
+ myChart.setOption(optionAdditions, true);
+ } else {
+ myChart.setOption(optionDeletions, true);
+ }
+ var firstday = new Date(jsonList[0].day.dateTime);
+ var firstDay = [ firstday.getFullYear(), firstday.getMonth() + 1, firstday.getDate() ].join('-');
+ var lastday = new Date(jsonList[jsonList.length - 1].day.dateTime);
+ var lastDay = [ lastday.getFullYear(), lastday.getMonth() + 1, lastday.getDate() ].join('-');
+
+ // console.log("firstday and lastday",firstDay,"##",lastDay);
+ if ((fromDay == 'null' && toDay == 'null') || (fromDay == firstDay && toDay == lastDay)) {
+ myChart.setOption({
+ toolbox : {
+ feature : {
+ restore : {
+ title : 'Restore date range',
+ iconStyle : {
+ opacity : 0
+ }
+ }
+ },
+ right: '40px'
+ },
+ });
+ } else {
+ myChart.setOption({
+ toolbox : {
+ feature : {
+ restore : {
+ title: 'Restore date range',
+ iconStyle : {
+ opacity : 1
+ }
+ }
+ },
+ right: '40px'
+ },
+ });
+ }
- myChart.on('click', function(params) {
- });
myChart.dispatchAction({
type : 'takeGlobalCursor',
key : 'dataZoomSelect',
dataZoomSelectActive : true // 允许缩放
});
+
myChart.on('restore', function(params) {
- myFunction(date[0], date[date.length - 1]);
- redraw(date[0], date[date.length - 1]);
- });
- $(window).resize(function() {
- myChart.resize();
+ var firstday = new Date(jsonList[0].day.dateTime);
+ var lastday = new Date(jsonList[jsonList.length - 1].day.dateTime)
+ myFunction([ firstday.getFullYear(), firstday.getMonth() + 1, firstday.getDate() ].join('/'), [ lastday.getFullYear(), lastday.getMonth() + 1, lastday.getDate() ].join('/'));
+ myChart.setOption({
+ toolbox : {
+ feature : {
+ restore : {
+ title: 'Restore date range',
+ iconStyle : {
+ opacity : 0
+ }
+ }
+ },
+ right: '40px'
+ },
+ });
+ redraw([ firstday.getFullYear(), firstday.getMonth() + 1, firstday.getDate() ].join('/'), [ lastday.getFullYear(), lastday.getMonth() + 1, lastday.getDate() ].join('/'));
});
+ $(window).resize(function() {myChart.resize()});
+
myChart.on('datazoom', function(params) {
myChart.setOption({
toolbox : {
feature : {
restore : {
- title: 'Restore date range',
+ title: 'Restore date range',
iconStyle : {
opacity : 1
}
}
},
- right: 40
+ right: '40px'
},
});
- var startValue = myChart.getModel().option.dataZoom[0].startValue;
- var endValue = myChart.getModel().option.dataZoom[0].endValue;
- myFunction(showdate[startValue], showdate[endValue]);
+ var startIndex = myChart.getModel().option.dataZoom[0].startValue;
+ var endIndex = myChart.getModel().option.dataZoom[0].endValue;
+ var startdate = Date.parse(showdate[startIndex]);
+ var enddate = Date.parse(showdate[endIndex]);
+ var startday = new Date(startdate);
+ var endday = new Date(enddate);
+ var currGap = (enddate - startdate) / (24 * 3600 * 1000);
+ //console.log("<<<<<<currGap+from+tp:",currGap,[startday.getFullYear(),startday.getMonth() + 1, startday.getDate()].join('/'),[endday.getFullYear(),endday.getMonth() + 1, endday.getDate()].join('/'))
+ if (gapday > 365) {
+ if (currGap < 365) {
+ redraw([ startday.getFullYear(), startday.getMonth() + 1, startday.getDate() ].join('/'), [ endday.getFullYear(), endday.getMonth() + 1, endday.getDate() ].join('/'));
+ myFunction([ startday.getFullYear(), startday.getMonth() + 1, startday.getDate() ].join('/'), [ endday.getFullYear(), endday.getMonth() + 1, endday.getDate() ].join('/'));
+ } else {
+ myFunction([ startday.getFullYear(), startday.getMonth() + 1, startday.getDate() ].join('/'), [ endday.getFullYear(), endday.getMonth() + 1, endday.getDate() ].join('/'));
+ }
+ } else {
+ myFunction([ startday.getFullYear(), startday.getMonth() + 1, startday.getDate() ].join('/'), [ endday.getFullYear(), endday.getMonth() + 1, endday.getDate() ].join('/'));
+ }
});
},
ondrawLinesReady : function(flag, jsonUserDailyContribution, orderBy, gap) {
+ //console.log("flag:"+flag+" "+gap);
function getMonthData(list) {
var monthdate = [];
var monthdata = [];
@@ -633,13 +952,24 @@ onedev.server.stats = {
}
},
restore : {
- title: 'Restore date range',
+ title: 'Restore date range',
iconStyle : {
opacity : 0
}
},
+ //saveAsImage: {show:false},
+ /*mytool:{//自定义按钮 danielinbiti,这里增加,selfbuttons可以随便取名字
+ show:true,//是否显示
+ title:'自定义', //鼠标移动上去显示的文字
+ icon: 'image://images/timg.jpg',
+ option:{},
+ onclick:function() {//点击事件,这里的option1是chart的option信息
+ alert('1');//这里可以加入自己的处理代码,切换不同的图形
+ }
+ },*/
+
},
- right: 40
+ right: '40px'
},
xAxis : {
type : 'category',
@@ -714,13 +1044,14 @@ onedev.server.stats = {
}
},
restore : {
- title: 'Restore date range',
+ title: 'Restore date range',
iconStyle : {
opacity : 0
}
},
+ //saveAsImage: {}
},
- right: 40
+ right: '40px'
},
xAxis : {
type : 'category',
@@ -772,7 +1103,7 @@ onedev.server.stats = {
var optionAdditions = {
tooltip : {
trigger : 'axis',
- formatter : '{b} <br/>{a}: {c}k',
+ formatter : '{b} <br/>{a}:{c}k',
position : function(pt) {
return [ pt[0], '10%' ];
}
@@ -796,13 +1127,14 @@ onedev.server.stats = {
}
},
restore : {
- title: 'Restore date range',
+ title: 'Restore date range',
iconStyle : {
opacity : 0
}
},
+ //saveAsImage: {}
},
- right: 40
+ right: '40px'
},
xAxis : {
type : 'category',
@@ -822,9 +1154,9 @@ onedev.server.stats = {
show : false
},
type : 'value',
- max : function(value) {
- return value.max * 1;
- },
+ /*max: function(value) {
+ return value.max *1;
+ },*/
boundaryGap : [ 0, '100%' ]
},
@@ -858,7 +1190,7 @@ onedev.server.stats = {
var optionAdditionsDaily = {
tooltip : {
trigger : 'axis',
- formatter : '{b} <br/>{a}: {c}k',
+ formatter : '{b} <br/>{a}:{c}k',
position : function(pt) {
return [ pt[0], '10%' ];
}
@@ -868,7 +1200,7 @@ onedev.server.stats = {
text : '',
},
grid : {
- left : "5%",
+ left : "7%",
right : "1%",
top : 30,
buttom : 0
@@ -882,13 +1214,14 @@ onedev.server.stats = {
}
},
restore : {
- title: 'Restore date range',
+ title: 'Restore date range',
iconStyle : {
opacity : 0
}
},
+ //saveAsImage: {}
},
- right: 40
+ right: '40px'
},
xAxis : {
type : 'category',
@@ -946,7 +1279,7 @@ onedev.server.stats = {
var optionDeletions = {
tooltip : {
trigger : 'axis',
- formatter : '{b} <br/>{a}: {c}k',
+ formatter : '{b} <br/>{a}:{c}k',
position : function(pt) {
return [ pt[0], '10%' ];
}
@@ -970,13 +1303,14 @@ onedev.server.stats = {
}
},
restore : {
- title: 'Restore date range',
+ title: 'Restore date range',
iconStyle : {
opacity : 0
}
},
+ //saveAsImage: {}
},
- right: 40
+ right: '40px'
},
xAxis : {
type : 'category',
@@ -1032,7 +1366,7 @@ onedev.server.stats = {
var optionDeletionsDaily = {
tooltip : {
trigger : 'axis',
- formatter : '{b} <br/>{a}: {c}k',
+ formatter : '{b} <br/>{a}:{c}k',
position : function(pt) {
return [ pt[0], '10%' ];
}
@@ -1056,13 +1390,14 @@ onedev.server.stats = {
}
},
restore : {
- title: 'Restore date range',
+ title: 'Restore date range',
iconStyle : {
opacity : 0
}
},
+ //saveAsImage: {}
},
- right: 40
+ right: '40px'
},
xAxis : {
type : 'category',
@@ -1126,9 +1461,8 @@ onedev.server.stats = {
if (gap > 365) myChart.setOption(optionDeletions);
else myChart.setOption(optionDeletionsDaily);
}
- $(window).resize(function() {
- myChart.resize();
- });
+ //myChart.showLoading();
+ $(window).resize(function() {myChart.resize();});
myChart.dispatchAction({
type : 'takeGlobalCursor',
key : 'dataZoomSelect',
@@ -1171,18 +1505,22 @@ onedev.server.stats = {
toolbox : {
feature : {
restore : {
- title: 'Restore date range',
+ title: 'Restore date range',
iconStyle : {
opacity : 1
}
}
},
- right: 40
+ right: '40px'
},
});
var startValue = myChart.getModel().option.dataZoom[0].startValue;
var endValue = myChart.getModel().option.dataZoom[0].endValue;
+ //console.log("start"+monthdate[startValue]+"/1");
+ //console.log("end"+monthdate[endValue]+"/1");
+
+ //console.log(monthdata[startValue]+" + "+monthdata[endValue]);
if (monthdata[startValue] == 0) {
for (var i = startValue + 1; i < endValue; i++) {
if (monthdata[i] != 0) {
@@ -1206,7 +1544,10 @@ onedev.server.stats = {
var startday = new Date(startdate);
var endday = new Date(enddate);
var gapday = (enddate - startdate) / (24 * 3600 * 1000);
+ //console.log("start----------",[startday.getFullYear(),startday.getMonth() + 1, startday.getDate()].join('/'),[endday.getFullYear(),endday.getMonth() + 1, endday.getDate()].join('/'));
+ //console.log("gapday in user:"+gapday);
if (gapday < 365 && monthdata[startValue] != 0 && monthdata[endValue] != 0) {
+ //console.log("here gapday",gapday);
var start = 0;
var end = jsonUserDailyContribution.length - 1;
for (var i = 0; i < jsonUserDailyContribution.length; i++) {
@@ -1221,6 +1562,7 @@ onedev.server.stats = {
break;
}
}
+ //console.log("start:"+start+" end:"+end);
var userDailyContribution = jsonUserDailyContribution.slice(start, end + 1);
var newdata = [];
@@ -1232,6 +1574,8 @@ onedev.server.stats = {
for (var j = byDay.length / 2; j < byDay.length; j++) {
newdate.push(byDay[j]);
}
+ //console.log("date:"+newdate);
+ //console.log("data:"+newdata);
myChart.clear();
myChart.setOption({
@@ -1260,10 +1604,11 @@ onedev.server.stats = {
}
},
restore : {
- title: 'Restore date range'
+ title: 'Restore date range',
},
+ //saveAsImage: {}
},
- right: 40
+ right: '40px'
},
xAxis : {
type : 'category',
diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java
index 1be6a93c1e..e3d90e263d 100644
--- a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java
+++ b/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java
@@ -7,7 +7,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.util.markdown.IssueParser;
import io.onedev.server.util.markdown.MarkdownProcessor;
-import io.onedev.server.web.page.project.issues.issuedetail.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
public class IssueProcessor extends IssueParser implements MarkdownProcessor {