Skip to content

The Unified and Autonomous Development Platform

midwork

Robin Shencc95609ee157
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
index b7146a8c0c..86c35466bf 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
@@ -27,6 +27,8 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {
void changeMilestones(Issue issue, Collection<Milestone> milestones);
+ void save(IssueChange change, @Nullable String note);
+
void addSchedule(Issue issue, Milestone milestone);
void removeSchedule(Issue issue, Milestone milestone);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java
index 78b3f427f4..b8a8ac6ea9 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java
@@ -1,5 +1,7 @@
package io.onedev.server.entitymanager;
+import javax.annotation.Nullable;
+
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
@@ -11,4 +13,6 @@ public interface PullRequestChangeManager extends EntityManager<PullRequestChang
void changeTitle(PullRequest request, String title);
+ void save(PullRequestChange change, @Nullable String note);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index ea596ee56d..f3ff9112d9 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -52,6 +52,7 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueSchedule;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Milestone;
@@ -156,9 +157,23 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
@Transactional
@Override
- public void save(IssueChange change) {
+ public void save(IssueChange change, String note) {
dao.persist(change);
- listenerRegistry.post(new IssueChanged(change));
+ if (note != null) {
+ IssueComment comment = new IssueComment();
+ comment.setContent(note);
+ comment.setUser(change.getUser());
+ comment.setIssue(change.getIssue());
+ comment.setDate(new DateTime(change.getDate()).plusMillis(1).toDate());
+ dao.persist(comment);
+ }
+
+ listenerRegistry.post(new IssueChanged(change, note));
+ }
+
+ @Override
+ public void save(IssueChange change) {
+ save(change, null);
}
@Transactional
@@ -234,10 +249,9 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
IssueChange change = new IssueChange();
change.setIssue(issue);
change.setUser(SecurityUtils.getUser());
- change.setComment(comment);
change.setData(new IssueStateChangeData(prevState, issue.getState(),
prevFields, issue.getFieldInputs()));
- save(change);
+ save(change, comment);
}
@Transactional
@@ -265,7 +279,6 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
IssueChange change = new IssueChange();
change.setIssue(issue);
change.setUser(SecurityUtils.getUser());
- change.setComment(comment);
List<Milestone> prevMilestoneList = new ArrayList<>(prevMilestones);
prevMilestoneList.sort(new Milestone.DatesAndStatusComparator());
@@ -273,7 +286,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
currentMilestoneList.sort(new Milestone.DatesAndStatusComparator());
change.setData(new IssueBatchUpdateData(prevState, issue.getState(), prevMilestoneList,
currentMilestoneList, prevFields, issue.getFieldInputs()));
- save(change);
+ save(change, comment);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
index cff583cc24..7cb1e5d173 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
@@ -5,11 +5,14 @@ import java.util.Date;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.joda.time.DateTime;
+
import io.onedev.commons.loader.ListenerRegistry;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.event.pullrequest.PullRequestChanged;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;
@@ -32,9 +35,24 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullReque
@Transactional
@Override
- public void save(PullRequestChange change) {
+ public void save(PullRequestChange change, String note) {
dao.persist(change);
- listenerRegistry.post(new PullRequestChanged(change));
+
+ if (note != null) {
+ PullRequestComment comment = new PullRequestComment();
+ comment.setContent(note);
+ comment.setUser(change.getUser());
+ comment.setRequest(change.getRequest());
+ comment.setDate(new DateTime(change.getDate()).plusMillis(1).toDate());
+ dao.persist(comment);
+ }
+
+ listenerRegistry.post(new PullRequestChanged(change, note));
+ }
+
+ @Override
+ public void save(PullRequestChange change) {
+ save(change, null);
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 48e0a42234..8af655e2c8 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -227,11 +227,10 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
PullRequestChange change = new PullRequestChange();
change.setDate(new Date());
- change.setComment(note);
change.setData(new PullRequestSourceBranchRestoreData());
change.setRequest(request);
change.setUser(SecurityUtils.getUser());
- changeManager.save(change);
+ changeManager.save(change, note);
}
}
@@ -244,11 +243,10 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
projectManager.deleteBranch(request.getSourceProject(), request.getSourceBranch());
PullRequestChange change = new PullRequestChange();
change.setDate(new Date());
- change.setComment(note);
change.setData(new PullRequestSourceBranchDeleteData());
change.setRequest(request);
change.setUser(SecurityUtils.getUser());
- changeManager.save(change);
+ changeManager.save(change, note);
}
}
@@ -260,11 +258,10 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
PullRequestChange change = new PullRequestChange();
change.setDate(new Date());
- change.setComment(note);
change.setData(new PullRequestReopenData());
change.setRequest(request);
change.setUser(user);
- changeManager.save(change);
+ changeManager.save(change, note);
MergePreview mergePreview = request.getMergePreview();
if (mergePreview != null && mergePreview.getMergeCommitHash() != null)
@@ -285,12 +282,11 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
request.setCloseInfo(closeInfo);
PullRequestChange change = new PullRequestChange();
- change.setComment(note);
change.setData(new PullRequestDiscardData());
change.setDate(closeInfo.getDate());
change.setRequest(request);
change.setUser(user);
- changeManager.save(change);
+ changeManager.save(change, note);
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
index de1d3ce3bd..b839f7e141 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
@@ -110,7 +110,6 @@ public class DefaultPullRequestReviewManager extends BaseEntityManager<PullReque
change.setDate(new Date());
change.setRequest(review.getRequest());
- change.setComment(result.getComment());
if (Boolean.TRUE.equals(result.getApproved()))
change.setData(new PullRequestApproveData());
else if (Boolean.FALSE.equals(result.getApproved()))
@@ -118,7 +117,7 @@ public class DefaultPullRequestReviewManager extends BaseEntityManager<PullReque
else
change.setData(new PullRequestReviewWithdrawData());
change.setUser(review.getUser());
- changeManager.save(change);
+ changeManager.save(change, result.getComment());
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
index 80fd242468..1a87ca9a81 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
@@ -235,7 +235,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {
@Transactional
@Listen
public void on(IssueChanged event) {
- addReferenceChange(event.getIssue(), event.getChange().getComment());
+ addReferenceChange(event.getIssue(), event.getComment());
}
@Transactional
@@ -247,7 +247,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {
@Transactional
@Listen
public void on(PullRequestChanged event) {
- addReferenceChange(event.getRequest(), event.getChange().getComment());
+ addReferenceChange(event.getRequest(), event.getComment());
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java
index f290e1b7a2..e1ab4c4374 100644
--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueChanged.java
@@ -3,6 +3,8 @@ package io.onedev.server.event.issue;
import java.util.Collection;
import java.util.Map;
+import javax.annotation.Nullable;
+
import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
@@ -12,9 +14,12 @@ public class IssueChanged extends IssueEvent {
private final IssueChange change;
- public IssueChanged(IssueChange change) {
+ private final String comment;
+
+ public IssueChanged(IssueChange change, @Nullable String comment) {
super(change.getUser(), change.getDate(), change.getIssue());
this.change = change;
+ this.comment = comment;
}
public IssueChange getChange() {
@@ -23,7 +28,12 @@ public class IssueChanged extends IssueEvent {
@Override
public String getMarkdown() {
- return change.getComment();
+ return comment;
+ }
+
+ @Nullable
+ public String getComment() {
+ return comment;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java
index 3ad23e0012..185e02177a 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChanged.java
@@ -1,5 +1,7 @@
package io.onedev.server.event.pullrequest;
+import javax.annotation.Nullable;
+
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.model.PullRequestChange;
@@ -13,9 +15,12 @@ public class PullRequestChanged extends PullRequestEvent implements CommitAware
private final PullRequestChange change;
- public PullRequestChanged(PullRequestChange change) {
+ private final String note;
+
+ public PullRequestChanged(PullRequestChange change, @Nullable String note) {
super(change.getUser(), change.getDate(), change.getRequest());
this.change = change;
+ this.note = note;
}
public PullRequestChange getChange() {
@@ -24,7 +29,12 @@ public class PullRequestChanged extends PullRequestEvent implements CommitAware
@Override
public String getMarkdown() {
- return change.getComment();
+ return note;
+ }
+
+ @Nullable
+ public String getComment() {
+ return note;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueChange.java b/server-core/src/main/java/io/onedev/server/model/IssueChange.java
index baaa5382d1..ac8d021218 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueChange.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueChange.java
@@ -12,8 +12,6 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.apache.commons.lang3.StringUtils;
-
import io.onedev.server.model.support.issue.changedata.IssueChangeData;
@Entity
@@ -23,10 +21,6 @@ public class IssueChange extends AbstractEntity {
private static final long serialVersionUID = 1L;
- public static final int MAX_COMMENT_LEN = 15000;
-
- public static final String PROP_COMMENT = "comment";
-
@ManyToOne
@JoinColumn(nullable=false)
private Issue issue;
@@ -37,9 +31,6 @@ public class IssueChange extends AbstractEntity {
@Column(nullable=false)
private Date date = new Date();
- @Column(length=MAX_COMMENT_LEN)
- private String comment;
-
@Lob
@Column(length=65535, nullable=false)
private IssueChangeData data;
@@ -77,18 +68,6 @@ public class IssueChange extends AbstractEntity {
this.data = data;
}
- @Nullable
- public String getComment() {
- return comment;
- }
-
- public void setComment(@Nullable String comment) {
- if (comment != null)
- this.comment = StringUtils.abbreviate(comment, MAX_COMMENT_LEN);
- else
- this.comment = null;
- }
-
public String getAnchor() {
return getClass().getSimpleName() + "-" + getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java b/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java
index b01cc75be6..e86423f021 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestChange.java
@@ -12,8 +12,6 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
-import org.apache.commons.lang3.StringUtils;
-
import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
@Entity
@@ -22,12 +20,8 @@ public class PullRequestChange extends AbstractEntity {
private static final long serialVersionUID = 1L;
- private static final int MAX_COMMENT_LEN = 14000;
-
public static final int DIFF_CONTEXT_SIZE = 3;
- public static final String PROP_COMMENT = "comment";
-
@ManyToOne
@JoinColumn(nullable=false)
private PullRequest request;
@@ -38,9 +32,6 @@ public class PullRequestChange extends AbstractEntity {
@Column(nullable=false)
private Date date = new Date();
- @Column(length=MAX_COMMENT_LEN)
- private String comment;
-
@Lob
@Column(length=65535)
private PullRequestChangeData data;
@@ -78,18 +69,6 @@ public class PullRequestChange extends AbstractEntity {
this.date = date;
}
- @Nullable
- public String getComment() {
- return comment;
- }
-
- public void setComment(@Nullable String comment) {
- if (comment != null)
- this.comment = StringUtils.abbreviate(comment, MAX_COMMENT_LEN);
- else
- this.comment = null;
- }
-
public String getAnchor() {
return getClass().getSimpleName() + "-" + getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java b/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java
index 8f7a3c6426..d26c5b7532 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java
@@ -67,6 +67,10 @@ public class PullRequestComment extends AbstractEntity {
return date;
}
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
public Project getProject() {
return request.getTargetProject();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
index 3433787f27..427b18a731 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentCriteria.java
@@ -9,7 +9,6 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
import io.onedev.server.util.criteria.Criteria;
@@ -25,14 +24,10 @@ public class CommentCriteria extends Criteria<Issue> {
@Override
public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
- Join<?, ?> commentJoin = from.join(Issue.PROP_COMMENTS, JoinType.LEFT);
- Path<String> contentAttribute = commentJoin.get(IssueComment.PROP_CONTENT);
- commentJoin.on(builder.like(builder.lower(contentAttribute), "%" + value.toLowerCase() + "%"));
-
- Join<?, ?> changeJoin = from.join(Issue.PROP_CHANGES, JoinType.LEFT);
- Path<String> commentAttribute = changeJoin.get(IssueChange.PROP_COMMENT);
- changeJoin.on(builder.like(builder.lower(commentAttribute), "%" + value.toLowerCase() + "%"));
- return builder.or(commentJoin.isNotNull(), changeJoin.isNotNull());
+ Join<?, ?> join = from.join(Issue.PROP_COMMENTS, JoinType.LEFT);
+ Path<String> attribute = join.get(IssueComment.PROP_CONTENT);
+ join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%"));
+ return join.isNotNull();
}
@Override
@@ -41,10 +36,6 @@ public class CommentCriteria extends Criteria<Issue> {
if (comment.getContent().toLowerCase().contains(value.toLowerCase()))
return true;
}
- for (IssueChange change: issue.getChanges()) {
- if (change.getComment() != null && change.getComment().toLowerCase().contains(value.toLowerCase()))
- return true;
- }
return false;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
index b17eae1131..f27f6bc72d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCriteria.java
@@ -9,7 +9,6 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.util.criteria.Criteria;
@@ -25,15 +24,10 @@ public class CommentCriteria extends Criteria<PullRequest> {
@Override
public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- Join<?, ?> commentJoin = from.join(PullRequest.PROP_COMMENTS, JoinType.LEFT);
- Path<String> contentAttribute = commentJoin.get(PullRequestComment.PROP_CONTENT);
- commentJoin.on(builder.like(builder.lower(contentAttribute), "%" + value.toLowerCase() + "%"));
-
- Join<?, ?> changeJoin = from.join(PullRequest.PROP_CHANGES, JoinType.LEFT);
- Path<String> commentAttribute = changeJoin.get(PullRequestChange.PROP_COMMENT);
- changeJoin.on(builder.like(builder.lower(commentAttribute), "%" + value.toLowerCase() + "%"));
-
- return builder.or(commentJoin.isNotNull(), changeJoin.isNotNull());
+ Join<?, ?> join = from.join(PullRequest.PROP_COMMENTS, JoinType.LEFT);
+ Path<String> attribute = join.get(PullRequestComment.PROP_CONTENT);
+ join.on(builder.like(builder.lower(attribute), "%" + value.toLowerCase() + "%"));
+ return join.isNotNull();
}
@Override
@@ -42,10 +36,6 @@ public class CommentCriteria extends Criteria<PullRequest> {
if (comment.getContent().toLowerCase().contains(value.toLowerCase()))
return true;
}
- for (PullRequestChange change: request.getChanges()) {
- if (change.getComment() != null && change.getComment().toLowerCase().contains(value.toLowerCase()))
- return true;
- }
return false;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
index 168aea65ab..fd1e55fc7a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
@@ -4,6 +4,5 @@
</div>
<div class="body">
<div wicket:id="detail" class="detail"></div>
- <div wicket:id="comment" class="comment"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
index ba62ce5a56..c4d9ac92a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
@@ -1,29 +1,15 @@
package io.onedev.server.web.component.issue.activities.activity;
-import java.util.List;
-
import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
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.entitymanager.IssueChangeManager;
-import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
import io.onedev.server.notification.ActivityDetail;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-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")
class IssueChangePanel extends GenericPanel<IssueChange> {
@@ -54,61 +40,12 @@ class IssueChangePanel extends GenericPanel<IssueChange> {
.add(new AttributeAppender("title", DateUtils.formatDateTime(getChange().getDate()))));
ActivityDetail detail = getChange().getData().getActivityDetail();
- if (detail != null)
+ if (detail != null) {
add(detail.render("detail"));
- else
+ } else {
add(new WebMarkupContainer("detail").setVisible(false));
-
- add(new ProjectCommentPanel("comment") {
-
- @Override
- protected String getComment() {
- return getChange().getComment();
- }
-
- @Override
- protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getChange().getIssue().getParticipants());
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, String comment) {
- getChange().setComment(comment);
- OneDev.getInstance(IssueChangeManager.class).save(getChange());
- }
-
- @Override
- protected Project getProject() {
- return getChange().getIssue().getProject();
- }
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getChange().getIssue().getUUID(),
- SecurityUtils.canManageIssues(getProject()));
- }
-
- @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;
- }
-
- });
+ add(AttributeAppender.append("class", "no-body"));
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
index 90b1e1027b..bce3937171 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
@@ -43,3 +43,10 @@
.issue-activities>table>tbody>tr>td.content>.body>.detail+.comment {
margin-top: 1rem;
}
+
+.issue-activities>table>tbody>tr>td.content.no-body {
+ vertical-align: middle;
+}
+.issue-activities>table>tbody>tr>td.content.no-body>.body {
+ display: none;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
index 0a6b52370f..6994a4e5eb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
@@ -5,6 +5,5 @@
</div>
<div class="body">
<div wicket:id="detail" class="detail"></div>
- <div wicket:id="comment" class="comment"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
index 60ab8a973e..1cd3d5b3df 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
@@ -1,9 +1,6 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-import java.util.List;
-
import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -11,22 +8,11 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.model.User;
import io.onedev.server.notification.ActivityDetail;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-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")
class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
@@ -63,61 +49,12 @@ class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
}, getChange().getDate()));
ActivityDetail detail = getChange().getData().getActivityDetail();
- if (detail != null)
+ if (detail != null) {
add(detail.render("detail"));
- else
- add(new WebMarkupContainer("detail").setVisible(false));
-
- add(new ProjectCommentPanel("comment") {
-
- @Override
- protected String getComment() {
- return getChange().getComment();
- }
-
- @Override
- protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getChange().getRequest().getParticipants());
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, String comment) {
- getChange().setComment(comment);
- OneDev.getInstance(PullRequestChangeManager.class).save(getChange());
- }
-
- @Override
- protected Project getProject() {
- return getChange().getRequest().getProject();
- }
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getChange().getRequest().getUUID(),
- SecurityUtils.canManagePullRequests(getProject()));
- }
-
- @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("detail").setVisible(false));
+ add(AttributeAppender.append("class", "no-body"));
+ }
}
private PullRequestChange getChange() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
index a1e2a1a02d..07c8deded6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
@@ -77,6 +77,12 @@
.pull-request-detail>.card-body>.main>.activities .activity>td>.body {
margin-top: 1rem;
}
+.pull-request-detail>.card-body>.main>.activities .activity>td.no-body {
+ vertical-align: middle;
+}
+.pull-request-detail>.card-body>.main>.activities .activity>td.no-body>.body {
+ display: none;
+}
.pull-request-detail>.card-body>.main>.activities .activity.since-changes .avatar div {
border-radius: 20px;