The Unified and Autonomous Development Platform
midwork
robin shen2b255984d2ad
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex f9b57773a9..68b1c85fc1 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -92,6 +92,7 @@ import io.onedev.server.manager.ConfigManager;import io.onedev.server.manager.DataManager;import io.onedev.server.manager.GroupAuthorizationManager;import io.onedev.server.manager.GroupManager;+import io.onedev.server.manager.IssueActivityManager;import io.onedev.server.manager.IssueRelationManager;import io.onedev.server.manager.IssueFieldManager;import io.onedev.server.manager.IssueManager;@@ -129,7 +130,8 @@ import io.onedev.server.manager.impl.DefaultConfigManager;import io.onedev.server.manager.impl.DefaultDataManager;import io.onedev.server.manager.impl.DefaultGroupAuthorizationManager;import io.onedev.server.manager.impl.DefaultGroupManager;-import io.onedev.server.manager.impl.DefaultIssueDuplicationManager;+import io.onedev.server.manager.impl.DefaultIssueActivityManager;+import io.onedev.server.manager.impl.DefaultIssueRelationManager;import io.onedev.server.manager.impl.DefaultIssueFieldManager;import io.onedev.server.manager.impl.DefaultIssueManager;import io.onedev.server.manager.impl.DefaultMailManager;@@ -306,13 +308,14 @@ public class CoreModule extends AbstractPluginModule {bind(PullRequestReferenceManager.class).to(DefaultPullRequestReferenceManager.class);bind(WorkExecutor.class).to(DefaultWorkExecutor.class);bind(NotificationManager.class).to(DefaultNotificationManager.class);- bind(IssueRelationManager.class).to(DefaultIssueDuplicationManager.class);+ bind(IssueRelationManager.class).to(DefaultIssueRelationManager.class);bind(CacheManager.class).to(DefaultCacheManager.class);bind(VerificationManager.class).to(DefaultVerificationManager.class);bind(Session.class).toProvider(SessionProvider.class);bind(EntityManager.class).toProvider(SessionProvider.class);bind(SessionFactory.class).toProvider(SessionFactoryProvider.class);bind(EntityManagerFactory.class).toProvider(SessionFactoryProvider.class);+ bind(IssueActivityManager.class).to(DefaultIssueActivityManager.class);contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);diff --git a/core/src/main/java/io/onedev/server/manager/IssueActivityManager.java b/core/src/main/java/io/onedev/server/manager/IssueActivityManager.javanew file mode 100644index 0000000000..fa41021072--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/IssueActivityManager.java@@ -0,0 +1,8 @@+package io.onedev.server.manager;++import io.onedev.server.model.IssueActivity;+import io.onedev.server.persistence.dao.EntityManager;++public interface IssueActivityManager extends EntityManager<IssueActivity> {++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActivityManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActivityManager.javanew file mode 100644index 0000000000..841c4fd293--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActivityManager.java@@ -0,0 +1,20 @@+package io.onedev.server.manager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.manager.IssueActivityManager;+import io.onedev.server.model.IssueActivity;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultIssueActivityManager extends AbstractEntityManager<IssueActivity>+ implements IssueActivityManager {++ @Inject+ public DefaultIssueActivityManager(Dao dao) {+ super(dao);+ }++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueDuplicationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueRelationManager.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueDuplicationManager.javarename to core/src/main/java/io/onedev/server/manager/impl/DefaultIssueRelationManager.javaindex f8fe154048..a82b6d9115 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueDuplicationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueRelationManager.java@@ -13,11 +13,11 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;@Singleton-public class DefaultIssueDuplicationManager extends AbstractEntityManager<IssueRelation>+public class DefaultIssueRelationManager extends AbstractEntityManager<IssueRelation>implements IssueRelationManager {@Inject- public DefaultIssueDuplicationManager(Dao dao) {+ public DefaultIssueRelationManager(Dao dao) {super(dao);}diff --git a/core/src/main/java/io/onedev/server/model/IssueActivity.java b/core/src/main/java/io/onedev/server/model/IssueActivity.javanew file mode 100644index 0000000000..12a5a7eb16--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/IssueActivity.java@@ -0,0 +1,104 @@+package io.onedev.server.model;++import java.util.Date;++import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.Table;++import io.onedev.server.model.support.issue.ActivityDetail;++@Entity+@Table(indexes={+ @Index(columnList="g_issue_id"), @Index(columnList="g_user_id"),+ @Index(columnList="comment")})+public class IssueActivity extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @ManyToOne+ @JoinColumn(nullable=false)+ private Issue issue;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn+ private User user;++ private String userName;++ @Column(nullable=false)+ private Date date;++ @Column(nullable=false)+ private String summary;++ @Lob+ @Column(nullable=false, length=65535)+ private String comment;++ @Lob+ @Column(nullable=false, length=65535)+ private ActivityDetail detail;++ public Issue getIssue() {+ return issue;+ }++ public void setIssue(Issue issue) {+ this.issue = issue;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ public String getUserName() {+ return userName;+ }++ public void setUserName(String userName) {+ this.userName = userName;+ }++ public Date getDate() {+ return date;+ }++ public void setDate(Date date) {+ this.date = date;+ }++ public String getSummary() {+ return summary;+ }++ public void setSummary(String summary) {+ this.summary = summary;+ }++ public String getComment() {+ return comment;+ }++ public void setComment(String comment) {+ this.comment = comment;+ }++ public ActivityDetail getDetail() {+ return detail;+ }++ public void setDetail(ActivityDetail detail) {+ this.detail = detail;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/ActivityDetail.java b/core/src/main/java/io/onedev/server/model/support/issue/ActivityDetail.javanew file mode 100644index 0000000000..5410d7c836--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/ActivityDetail.java@@ -0,0 +1,13 @@+package io.onedev.server.model.support.issue;++import java.io.Serializable;++import org.apache.wicket.Component;++import io.onedev.server.model.IssueActivity;++public interface ActivityDetail extends Serializable {++ Component render(String componentId, IssueActivity activity);++}diff --git a/core/src/main/java/io/onedev/server/web/component/comment/code-comment.css b/core/src/main/java/io/onedev/server/web/component/comment/code-comment.cssindex b0a0513d13..fd8c1d0006 100644--- a/core/src/main/java/io/onedev/server/web/component/comment/code-comment.css+++ b/core/src/main/java/io/onedev/server/web/component/comment/code-comment.css@@ -11,6 +11,8 @@}.code-comments td.result {border: 2px solid #E0E0E0;+ vertical-align: top;+ text-align: left;}.code-comments td.comment {padding: 20px 20px 0 20px;@@ -51,7 +53,6 @@.code-comments td.result .norecords-td {padding: 20px;font-size: 20px;- text-align: center;}.code-comments .alert {border-radius: 0;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.cssindex 4dc61ccfe4..df3ef6d13d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css@@ -14,6 +14,7 @@}#request-list td.result {border: 2px solid #E0E0E0;+ vertical-align: top;}#request-list td.request {color: #888;