The Unified and Autonomous Development Platform
Fix issue #1184 - Attach commit to issue while referencing
Robin Shen4129bc05723c
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.javaindex d9d91200c7..c8984a7d49 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@@ -1,37 +1,10 @@package io.onedev.server.entitymanager.impl;-import java.util.*;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.entityreference.EntityReferenceManager;-import io.onedev.server.model.support.issue.changedata.*;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.Ref;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import org.joda.time.DateTime;-import org.quartz.CronScheduleBuilder;-import org.quartz.ScheduleBuilder;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import io.onedev.server.OneDev;import io.onedev.server.cluster.ClusterManager;-import io.onedev.server.entitymanager.IssueChangeManager;-import io.onedev.server.entitymanager.IssueFieldManager;-import io.onedev.server.entitymanager.IssueLinkManager;-import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.entitymanager.IssueScheduleManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.*;+import io.onedev.server.entityreference.EntityReferenceManager;import io.onedev.server.event.Listen;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.RefUpdated;@@ -42,24 +15,10 @@ import io.onedev.server.event.project.pullrequest.PullRequestOpened;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;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;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;+import io.onedev.server.model.*;import io.onedev.server.model.support.issue.TransitionSpec;-import io.onedev.server.model.support.issue.transitiontrigger.BranchUpdateTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.DiscardPullRequestTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.MergePullRequestTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.NoActivityTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.OpenPullRequestTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.PullRequestTrigger;-import io.onedev.server.model.support.issue.transitiontrigger.StateTransitionTrigger;+import io.onedev.server.model.support.issue.changedata.*;+import io.onedev.server.model.support.issue.transitiontrigger.*;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;@@ -68,11 +27,7 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.IssueQueryLexer;-import io.onedev.server.search.entity.issue.IssueQueryParseOption;-import io.onedev.server.search.entity.issue.StateCriteria;-import io.onedev.server.search.entity.issue.LastActivityDateCriteria;+import io.onedev.server.search.entity.issue.*;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;import io.onedev.server.util.ProjectScope;@@ -84,6 +39,24 @@ import io.onedev.server.util.match.StringMatcher;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.schedule.SchedulableTask;import io.onedev.server.util.schedule.TaskScheduler;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.Ref;+import org.eclipse.jgit.lib.Repository;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevWalk;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import org.joda.time.DateTime;+import org.quartz.CronScheduleBuilder;+import org.quartz.ScheduleBuilder;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;+import java.util.*;@Singletonpublic class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>@@ -135,7 +108,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>@Overridepublic void create(IssueChange change, @Nullable String note) {dao.persist(change);- if (note != null) {+ if (note != null && change.getUser() != null) {IssueComment comment = new IssueComment();comment.setContent(note);comment.setUser(change.getUser());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.javaindex 5711a1df4f..5b54999a7f 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@@ -37,7 +37,7 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullRequepublic void save(PullRequestChange change, String note) {dao.persist(change);- if (note != null) {+ if (note != null && change.getUser() != null) {PullRequestComment comment = new PullRequestComment();comment.setContent(note);comment.setUser(change.getUser());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.javaindex c6b753590d..b65f9f104f 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@@ -1,13 +1,5 @@package io.onedev.server.entityreference;-import java.util.Date;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.jsoup.Jsoup;-import org.jsoup.nodes.Document;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueManager;@@ -25,14 +17,25 @@ import io.onedev.server.event.project.pullrequest.PullRequestChanged;import io.onedev.server.event.project.pullrequest.PullRequestCommented;import io.onedev.server.event.project.pullrequest.PullRequestOpened;import io.onedev.server.markdown.MarkdownManager;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueChange;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestChange;+import io.onedev.server.model.*;+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCommitData;+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCommitData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.ProjectScopedNumber;+import org.jsoup.Jsoup;+import org.jsoup.nodes.Document;++import javax.inject.Inject;+import javax.inject.Singleton;+import java.util.Date;@Singletonpublic class DefaultEntityReferenceManager implements EntityReferenceManager {@@ -45,7 +48,8 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {@Injectpublic DefaultEntityReferenceManager(IssueChangeManager issueChangeManager,- PullRequestChangeManager pullRequestChangeManager, MarkdownManager markdownManager) {+ PullRequestChangeManager pullRequestChangeManager,+ MarkdownManager markdownManager) {this.issueChangeManager = issueChangeManager;this.pullRequestChangeManager = pullRequestChangeManager;this.markdownManager = markdownManager;@@ -60,9 +64,8 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {if (referencedIssue != null && !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 (change.getData() instanceof IssueReferencedFromIssueData) {+ IssueReferencedFromIssueData referencedFromIssueData = (IssueReferencedFromIssueData) change.getData();if (referencedFromIssueData.getIssueId().equals(issue.getId())) {found = true;break;@@ -70,8 +73,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {}}if (!found) {- io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData referencedFromIssueData =- new io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData(issue);+ IssueReferencedFromIssueData referencedFromIssueData = new IssueReferencedFromIssueData(issue);IssueChange change = new IssueChange();change.setData(referencedFromIssueData);change.setDate(new Date());@@ -87,9 +89,8 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {if (referencedRequest != null) {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 (change.getData() instanceof PullRequestReferencedFromIssueData) {+ PullRequestReferencedFromIssueData referencedFromIssueData = (PullRequestReferencedFromIssueData) change.getData();if (referencedFromIssueData.getIssueId().equals(issue.getId())) {found = true;break;@@ -97,8 +98,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {}}if (!found) {- io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData referencedFromIssueData =- new io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData(issue);+ PullRequestReferencedFromIssueData referencedFromIssueData = new PullRequestReferencedFromIssueData(issue);PullRequestChange change = new PullRequestChange();change.setData(referencedFromIssueData);change.setDate(new Date());@@ -111,6 +111,58 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {}}}++ public void addReferenceChange(ProjectScopedCommit commit) {+ String commitMessage = commit.getRevCommit().getFullMessage();+ for (ProjectScopedNumber referencedIssueFQN: new ReferenceParser(Issue.class).parseReferences(commitMessage, commit.getProject())) {+ Issue referencedIssue = OneDev.getInstance(IssueManager.class).find(referencedIssueFQN);+ if (referencedIssue != null) {+ boolean found = false;+ for (IssueChange change: referencedIssue.getChanges()) {+ if (change.getData() instanceof IssueReferencedFromCommitData) {+ IssueReferencedFromCommitData referencedFromCommitData = (IssueReferencedFromCommitData) change.getData();+ if (referencedFromCommitData.getCommit().equals(commit)) {+ found = true;+ break;+ }+ }+ }+ if (!found) {+ IssueReferencedFromCommitData referencedFromCommitData = new IssueReferencedFromCommitData(commit);+ IssueChange change = new IssueChange();+ change.setData(referencedFromCommitData);+ change.setDate(new Date());+ change.setIssue(referencedIssue);+ referencedIssue.getChanges().add(change);+ issueChangeManager.create(change, null);+ }+ }+ }+ for (ProjectScopedNumber referencedRequestFQN: new ReferenceParser(PullRequest.class).parseReferences(commitMessage, commit.getProject())) {+ PullRequest referencedRequest = OneDev.getInstance(PullRequestManager.class).find(referencedRequestFQN);+ if (referencedRequest != null) {+ boolean found = false;+ for (PullRequestChange change: referencedRequest.getChanges()) {+ if (change.getData() instanceof PullRequestReferencedFromCommitData) {+ PullRequestReferencedFromCommitData referencedFromCommitData = (PullRequestReferencedFromCommitData) change.getData();+ if (referencedFromCommitData.getCommit().equals(commit)) {+ found = true;+ break;+ }+ }+ }+ if (!found) {+ PullRequestReferencedFromCommitData referencedFromCommitData = new PullRequestReferencedFromCommitData(commit);+ PullRequestChange change = new PullRequestChange();+ change.setData(referencedFromCommitData);+ change.setDate(new Date());+ change.setRequest(referencedRequest);+ referencedRequest.getChanges().add(change);+ pullRequestChangeManager.save(change);+ }+ }+ }+ }@Overridepublic void addReferenceChange(PullRequest request, String markdown) {@@ -121,9 +173,8 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {if (referencedIssue != null) {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 (change.getData() instanceof IssueReferencedFromPullRequestData) {+ IssueReferencedFromPullRequestData referencedFromPullRequestData = (IssueReferencedFromPullRequestData) change.getData();if (referencedFromPullRequestData.getRequestId().equals(request.getId())) {found = true;break;@@ -131,8 +182,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {}}if (!found) {- io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData referencedFromPullRequestData =- new io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData(request);+ IssueReferencedFromPullRequestData referencedFromPullRequestData = new IssueReferencedFromPullRequestData(request);IssueChange change = new IssueChange();change.setData(referencedFromPullRequestData);change.setDate(new Date());@@ -148,9 +198,8 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {if (referencedRequest != null && !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 (change.getData() instanceof PullRequestReferencedFromPullRequestData) {+ PullRequestReferencedFromPullRequestData referencedFromPullRequestData = (PullRequestReferencedFromPullRequestData) change.getData();if (referencedFromPullRequestData.getRequestId().equals(request.getId())) {found = true;break;@@ -158,8 +207,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {}}if (!found) {- io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData referencedFromPullRequestData =- new io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData(request);+ PullRequestReferencedFromPullRequestData referencedFromPullRequestData = new PullRequestReferencedFromPullRequestData(request);PullRequestChange change = new PullRequestChange();change.setData(referencedFromPullRequestData);change.setDate(new Date());@@ -182,9 +230,8 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {if (referencedIssue != null) {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 (change.getData() instanceof IssueReferencedFromCodeCommentData) {+ IssueReferencedFromCodeCommentData referencedFromCodeCommentData = (IssueReferencedFromCodeCommentData) change.getData();if (referencedFromCodeCommentData.getCommentId().equals(comment.getId())) {found = true;break;@@ -192,8 +239,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {}}if (!found) {- io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData referencedFromCodeCommentData =- new io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData(comment);+ IssueReferencedFromCodeCommentData referencedFromCodeCommentData = new IssueReferencedFromCodeCommentData(comment);IssueChange change = new IssueChange();change.setData(referencedFromCodeCommentData);change.setDate(new Date());@@ -209,9 +255,8 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {if (referencedRequest != null) {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 (change.getData() instanceof PullRequestReferencedFromCodeCommentData) {+ PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData = (PullRequestReferencedFromCodeCommentData) change.getData();if (referencedFromCodeCommentData.getCommentId().equals(comment.getId())) {found = true;break;@@ -219,8 +264,7 @@ public class DefaultEntityReferenceManager implements EntityReferenceManager {}}if (!found) {- io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData =- new io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData(comment);+ PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData = new PullRequestReferencedFromCodeCommentData(comment);PullRequestChange change = new PullRequestChange();change.setData(referencedFromCodeCommentData);change.setDate(new Date());diff --git a/server-core/src/main/java/io/onedev/server/entityreference/EntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/entityreference/EntityReferenceManager.javaindex c6121fd61f..f2f27eee74 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/EntityReferenceManager.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/EntityReferenceManager.java@@ -5,6 +5,7 @@ import javax.annotation.Nullable;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;+import io.onedev.server.util.ProjectScopedCommit;public interface EntityReferenceManager {@@ -13,5 +14,7 @@ public interface EntityReferenceManager {void addReferenceChange(PullRequest request, @Nullable String markdown);void addReferenceChange(CodeComment comment, @Nullable String markdown);++ void addReferenceChange(ProjectScopedCommit commit);}diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.javaindex cba11d741d..7b669045ea 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java@@ -45,8 +45,27 @@ public class ReferenceParser {pattern = Pattern.compile(builder.toString(), Pattern.CASE_INSENSITIVE);}- public Collection<ProjectScopedNumber> parseReferences(Project project, String rendered) {- return parseReferences(Jsoup.parseBodyFragment(rendered), project);+ public Collection<ProjectScopedNumber> parseReferences(String text, @Nullable Project project) {+ Collection<ProjectScopedNumber> references = new HashSet<>();+ if (StringUtils.deleteWhitespace(text.toLowerCase()).contains(referenceType.toLowerCase())+ && text.contains("#")) { // fast scan here, do pattern match later+ Matcher matcher = pattern.matcher(text);+ while (matcher.find()) {+ String referenceProjectName = matcher.group(3);+ Long referenceNumber = Long.valueOf(matcher.group(5));++ Project referenceProject;+ if (referenceProjectName != null) {+ referenceProject = OneDev.getInstance(ProjectManager.class).findByPath(referenceProjectName);+ } else {+ referenceProject = project;+ }++ if (referenceProject != null)+ references.add(new ProjectScopedNumber(referenceProject, referenceNumber));+ }+ }+ return references;}public Collection<ProjectScopedNumber> parseReferences(Document document, @Nullable Project project) {diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.javaindex 4fdf9e52fd..567db1c0b8 100644--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.java+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.java@@ -3,10 +3,25 @@ package io.onedev.server.entityreference;import javax.annotation.Nullable;import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Issue;+import io.onedev.server.model.PullRequest;+import io.onedev.server.security.SecurityUtils;public interface ReferencedFromAware<T extends AbstractEntity> {@NullableT getReferencedFrom();+ public static boolean canDisplay(ReferencedFromAware<?> referencedFromAware) {+ AbstractEntity referencedFrom = referencedFromAware.getReferencedFrom();+ if (referencedFrom instanceof Issue)+ return SecurityUtils.canAccess((Issue) referencedFrom);+ else if (referencedFrom instanceof PullRequest)+ return SecurityUtils.canReadCode(((PullRequest) referencedFrom).getProject());+ else if (referencedFrom instanceof CodeComment)+ return SecurityUtils.canReadCode(((CodeComment) referencedFrom).getProject());+ else+ return referencedFrom != null;+ }}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.javaindex 1b6251d9c4..05a83d62b5 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java@@ -13,6 +13,7 @@ import io.onedev.server.entitymanager.EmailAddressManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.entityreference.EntityReferenceManager;import io.onedev.server.event.Listen;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.entity.EntityRemoved;@@ -154,6 +155,8 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerprivate final EmailAddressManager emailAddressManager;private final IssueManager issueManager;++ private final EntityReferenceManager entityReferenceManager;private final ListenerRegistry listenerRegistry;@@ -170,7 +173,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerBatchWorkManager batchWorkManager, SessionManager sessionManager,EmailAddressManager emailAddressManager, UserManager userManager,ClusterManager clusterManager, ListenerRegistry listenerRegistry,- IssueManager issueManager) {+ IssueManager issueManager, EntityReferenceManager entityReferenceManager) {this.projectManager = projectManager;this.storageManager = storageManager;this.batchWorkManager = batchWorkManager;@@ -180,6 +183,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerthis.clusterManager = clusterManager;this.listenerRegistry = listenerRegistry;this.issueManager = issueManager;+ this.entityReferenceManager = entityReferenceManager;}private boolean isCommitCollected(byte[] commitBytes) {@@ -337,6 +341,9 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagerwriteCommits(fixCommitsStore, txn, issueKey, fixingCommits);listenerRegistry.post(new IssueCommitsAttached(issueManager.load(issueId)));}++ entityReferenceManager.addReferenceChange(+ new ProjectScopedCommit(project, project.getRevCommit(currentCommitId, true)));if (currentCommit.getCommitter() != null)users.add(new NameAndEmail(currentCommit.getCommitter()));diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex dec09a52d4..e98432735b 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -25,6 +25,7 @@ import io.onedev.server.search.entity.SortField;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.Input;+import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.facade.IssueFacade;import io.onedev.server.web.editable.BeanDescriptor;@@ -291,7 +292,7 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment@OneToMany(mappedBy=IssueLink.PROP_SOURCE, cascade=CascadeType.REMOVE)private Collection<IssueLink> targetLinks = new ArrayList<>();- private transient List<FixCommit> commits;+ private transient List<ProjectScopedCommit> commits;private transient List<PullRequest> pullRequests;@@ -774,8 +775,8 @@ public class Issue extends ProjectBelonging implements Referenceable, AttachmentPullRequestInfoManager infoManager = OneDev.getInstance(PullRequestInfoManager.class);Collection<Long> pullRequestIds = new HashSet<>();- for (FixCommit commit: getCommits())- pullRequestIds.addAll(infoManager.getPullRequestIds(commit.getProject(), commit.getCommit()));+ for (ProjectScopedCommit commit: getCommits())+ pullRequestIds.addAll(infoManager.getPullRequestIds(commit.getProject(), commit.getCommitId()));for (Long requestId: pullRequestIds) {PullRequest request = OneDev.getInstance(PullRequestManager.class).get(requestId);@@ -794,7 +795,7 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachmentreturn pullRequests;}- public List<FixCommit> getCommits() {+ public List<ProjectScopedCommit> getCommits() {if (commits == null) {commits = new ArrayList<>();CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);@@ -803,15 +804,15 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachmentfor (ObjectId commitId: commitInfoManager.getFixCommits(it.getId(), getId())) {RevCommit commit = it.getRevCommit(commitId, false);if (commit != null)- commits.add(new FixCommit(it, commit));+ commits.add(new ProjectScopedCommit(it, commit.copy()));}});- Collections.sort(commits, new Comparator<FixCommit>() {+ Collections.sort(commits, new Comparator<ProjectScopedCommit>() {@Override- public int compare(FixCommit o1, FixCommit o2) {- return o2.getCommit().getCommitTime() - o1.getCommit().getCommitTime();+ public int compare(ProjectScopedCommit o1, ProjectScopedCommit o2) {+ return o2.getRevCommit().getCommitTime() - o1.getRevCommit().getCommitTime();}});@@ -940,25 +941,4 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachmentstack.get().pop();}- public static class FixCommit {-- private final Project project;-- private final RevCommit commit;-- public FixCommit(Project project, RevCommit commit) {- this.project = project;- this.commit = commit;- }-- public Project getProject() {- return project;- }-- public RevCommit getCommit() {- return commit;- }-- }-}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.javaindex 38ecc794dd..e02bb09982 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@@ -1,18 +1,11 @@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.changedata.IssueChangeData;+import javax.annotation.Nullable;+import javax.persistence.*;+import java.util.Date;+@Entity@Table(indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")})@@ -25,7 +18,6 @@ public class IssueChange extends AbstractEntity {private Issue issue;@ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)private User user;@Column(nullable=false)@@ -43,11 +35,12 @@ public class IssueChange extends AbstractEntity {this.issue = issue;}+ @Nullablepublic User getUser() {return user;}- public void setUser(User user) {+ public void setUser(@Nullable User user) {this.user = user;}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.javaindex bd1d7f156a..22ef182cd0 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@@ -1,18 +1,11 @@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.pullrequest.changedata.PullRequestChangeData;+import javax.annotation.Nullable;+import javax.persistence.*;+import java.util.Date;+@Entity@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")})public class PullRequestChange extends AbstractEntity {@@ -26,7 +19,6 @@ public class PullRequestChange extends AbstractEntity {private PullRequest request;@ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)private User user;@Column(nullable=false)@@ -52,11 +44,12 @@ public class PullRequestChange extends AbstractEntity {this.data = data;}+ @Nullablepublic User getUser() {return user;}- public void setUser(User user) {+ public void setUser(@Nullable User user) {this.user = user;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCommitData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCommitData.javanew file mode 100644index 0000000000..8e8b899ac9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCommitData.java@@ -0,0 +1,62 @@+package io.onedev.server.model.support.issue.changedata;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entityreference.ReferencedFromAware;+import io.onedev.server.model.Group;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.notification.ActivityDetail;+import io.onedev.server.util.ProjectScopedCommit;+import org.eclipse.jgit.lib.ObjectId;++import java.util.Collection;+import java.util.HashMap;+import java.util.Map;++public class IssueReferencedFromCommitData extends IssueChangeData {++ private static final long serialVersionUID = 1L;++ private final ProjectScopedCommit commit;++ public IssueReferencedFromCommitData(ProjectScopedCommit commit) {+ this.commit = commit;+ }++ public ProjectScopedCommit getCommit() {+ return commit;+ }++ @Override+ public String getActivity() {+ return "referenced from commit";+ }++ @Override+ public Map<String, Collection<User>> getNewUsers() {+ return new HashMap<>();+ }++ @Override+ public Map<String, Group> getNewGroups() {+ return new HashMap<>();+ }++ @Override+ public boolean affectsListing() {+ return false;+ }++ @Override+ public boolean isMinor() {+ return true;+ }++ @Override+ public ActivityDetail getActivityDetail() {+ return ActivityDetail.referencedFrom(getCommit());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCommitData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCommitData.javanew file mode 100644index 0000000000..aa601ff525--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCommitData.java@@ -0,0 +1,37 @@+package io.onedev.server.model.support.pullrequest.changedata;++import io.onedev.server.model.Group;+import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.changedata.IssueChangeData;+import io.onedev.server.notification.ActivityDetail;+import io.onedev.server.util.ProjectScopedCommit;++import java.util.Collection;+import java.util.HashMap;+import java.util.Map;++public class PullRequestReferencedFromCommitData extends PullRequestChangeData {++ private static final long serialVersionUID = 1L;++ private final ProjectScopedCommit commit;++ public PullRequestReferencedFromCommitData(ProjectScopedCommit commit) {+ this.commit = commit;+ }++ public ProjectScopedCommit getCommit() {+ return commit;+ }++ @Override+ public String getActivity() {+ return "referenced from commit";+ }++ @Override+ public ActivityDetail getActivityDetail() {+ return ActivityDetail.referencedFrom(getCommit());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java b/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.javaindex 63fb685ade..4e7a295351 100644--- a/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java+++ b/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java@@ -1,26 +1,31 @@package io.onedev.server.notification;-import java.io.Serializable;-import java.util.List;-import java.util.Map;--import org.apache.wicket.Component;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.basic.Label;-import org.unbescape.html.HtmlEscape;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.PropertyChange;import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.asset.fieldcompare.FieldCompareCssResourceReference;import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;+import io.onedev.server.web.component.commit.info.CommitInfoPanel;import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;import io.onedev.server.web.component.pullrequest.referencedfrom.ReferencedFromPullRequestPanel;+import io.onedev.server.web.page.project.ProjectPage;+import org.apache.wicket.Component;+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.Model;+import org.eclipse.jgit.revwalk.RevCommit;+import org.unbescape.html.HtmlEscape;++import java.io.Serializable;+import java.util.List;+import java.util.Map;public class ActivityDetail implements Serializable {@@ -194,5 +199,30 @@ public class ActivityDetail implements Serializable {};}++ public static ActivityDetail referencedFrom(ProjectScopedCommit commit) {+ RevCommit revCommit = commit.getProject().getRevCommit(commit.getCommitId(), true);+ String url = OneDev.getInstance(UrlManager.class).urlFor(commit.getProject(), commit.getCommitId());+ String htmlVersion = String.format("<div><a href='%s'>[%s] %s</a></div>",+ url, commit.getFQN(), HtmlEscape.escapeHtml5(revCommit.getShortMessage()));+ String textVersion = String.format("[%s] %s\n", commit.getFQN(), revCommit.getShortMessage());++ return new ActivityDetail(htmlVersion, textVersion) {++ private static final long serialVersionUID = 1L;++ @Override+ public Component render(String componentId) {+ return new CommitInfoPanel(componentId, Model.of(commit)) {++ @Override+ protected Project getProject() {+ return ((ProjectPage)getPage()).getProject();+ }+ };+ }++ };+ }}diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueResource.javaindex c1ae8a761b..0d6835bbc8 100644--- a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/IssueResource.java@@ -24,6 +24,7 @@ import javax.ws.rs.QueryParam;import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;+import io.onedev.server.util.ProjectScopedCommit;import org.apache.shiro.authz.UnauthorizedException;import javax.validation.constraints.NotEmpty;@@ -171,10 +172,10 @@ public class IssueResource {throw new UnauthorizedException();List<FixCommit> issueCommits = new ArrayList<>();- for (Issue.FixCommit commit: issue.getCommits()) {+ for (ProjectScopedCommit commit: issue.getCommits()) {FixCommit issueCommit = new FixCommit();issueCommit.setProjectId(commit.getProject().getId());- issueCommit.setCommitHash(commit.getCommit().name());+ issueCommit.setCommitHash(commit.getCommitId().name());issueCommits.add(issueCommit);}return issueCommits;diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 238c5df339..f5def8b7d3 100644--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -1,28 +1,7 @@package io.onedev.server.security;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.Set;-import java.util.concurrent.Callable;--import javax.annotation.Nullable;-import javax.servlet.http.HttpServletRequest;-import javax.ws.rs.core.HttpHeaders;--import org.apache.shiro.authz.Permission;-import org.apache.shiro.subject.PrincipalCollection;-import org.apache.shiro.subject.SimplePrincipalCollection;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;-import org.apache.shiro.web.mgt.WebSecurityManager;-import org.eclipse.jgit.lib.ObjectId;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import com.google.common.base.Preconditions;import com.google.common.collect.Sets;-import io.onedev.commons.loader.AppLoader;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.OneDev;@@ -30,47 +9,28 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.Build;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.CodeCommentReply;-import io.onedev.server.model.Group;-import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueChange;-import io.onedev.server.model.IssueComment;-import io.onedev.server.model.LinkSpec;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestChange;-import io.onedev.server.model.PullRequestComment;-import io.onedev.server.model.Role;-import io.onedev.server.model.User;-import io.onedev.server.model.UserAuthorization;-import io.onedev.server.security.permission.AccessBuild;-import io.onedev.server.security.permission.AccessBuildLog;-import io.onedev.server.security.permission.AccessBuildReports;-import io.onedev.server.security.permission.AccessConfidentialIssues;-import io.onedev.server.security.permission.AccessProject;-import io.onedev.server.security.permission.ConfidentialIssuePermission;-import io.onedev.server.security.permission.CreateChildren;-import io.onedev.server.security.permission.CreateRootProjects;-import io.onedev.server.security.permission.EditIssueField;-import io.onedev.server.security.permission.EditIssueLink;-import io.onedev.server.security.permission.JobPermission;-import io.onedev.server.security.permission.ManageBuilds;-import io.onedev.server.security.permission.ManageCodeComments;-import io.onedev.server.security.permission.ManageIssues;-import io.onedev.server.security.permission.ManageJob;-import io.onedev.server.security.permission.ManageProject;-import io.onedev.server.security.permission.ManagePullRequests;-import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ReadCode;-import io.onedev.server.security.permission.RunJob;-import io.onedev.server.security.permission.ScheduleIssues;-import io.onedev.server.security.permission.SystemAdministration;-import io.onedev.server.security.permission.WriteCode;+import io.onedev.server.model.*;+import io.onedev.server.security.permission.*;import io.onedev.server.util.concurrent.PrioritizedCallable;import io.onedev.server.util.concurrent.PrioritizedRunnable;+import org.apache.shiro.authz.Permission;+import org.apache.shiro.subject.PrincipalCollection;+import org.apache.shiro.subject.SimplePrincipalCollection;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;+import org.apache.shiro.web.mgt.WebSecurityManager;+import org.eclipse.jgit.lib.ObjectId;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.annotation.Nullable;+import javax.servlet.http.HttpServletRequest;+import javax.ws.rs.core.HttpHeaders;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.Set;+import java.util.concurrent.Callable;public class SecurityUtils extends org.apache.shiro.SecurityUtils {@@ -311,18 +271,6 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {return user != null && user.equals(comment.getUser())|| canManageIssues(comment.getIssue().getProject());}-- public static boolean canModifyOrDelete(PullRequestChange change) {- User user = SecurityUtils.getUser();- return user != null && user.equals(change.getUser())- || canManagePullRequests(change.getRequest().getTargetProject());- }-- public static boolean canModifyOrDelete(IssueChange change) {- User user = SecurityUtils.getUser();- return user != null && user.equals(change.getUser())- || canManageIssues(change.getIssue().getProject());- }public static boolean canModify(PullRequest request) {User user = SecurityUtils.getUser();diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.javaindex b56710f835..8c19b88d99 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java@@ -1,18 +1,20 @@package io.onedev.server.util;-import java.io.Serializable;-import java.util.Collection;-import java.util.Stack;--import javax.annotation.Nullable;--import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;-import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.util.WicketUtils;+import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;++import javax.annotation.Nullable;+import java.io.Serializable;+import java.util.Collection;+import java.util.Stack;public class ProjectScopedCommit implements Serializable {@@ -43,9 +45,22 @@ public class ProjectScopedCommit implements Serializable {}public Project getProject() {- return OneDev.getInstance(ProjectManager.class).load(projectId);+ return getProject(true);}+ @Nullable+ public Project getProject(boolean mustExist) {+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ if (mustExist)+ return projectManager.load(projectId);+ else+ return projectManager.get(projectId);+ }++ public RevCommit getRevCommit() {+ return getProject().getRevCommit(commitId, true);+ }+public Long getProjectId() {return projectId;}@@ -97,4 +112,38 @@ public class ProjectScopedCommit implements Serializable {}}+ public boolean canDisplay() {+ Project project = getProject(false);+ return project != null+ && SecurityUtils.canReadCode(project)+ && project.getRevCommit(commitId, false) != null;+ }++ @Override+ public boolean equals(Object other) {+ if (!(other instanceof ProjectScopedCommit))+ return false;+ if (this == other)+ return true;+ ProjectScopedCommit otherProjectScopedCommit = (ProjectScopedCommit) other;+ return new EqualsBuilder()+ .append(projectId, otherProjectScopedCommit.projectId)+ .append(commitId, otherProjectScopedCommit.commitId)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37).append(projectId).append(commitId).toHashCode();+ }++ public String getFQN() {+ return getProject().getPath() + ":" + GitUtils.abbreviateSHA(getCommitId().name());+ }++ @Override+ public String toString() {+ return getFQN();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.javaindex 8cab3c00d4..1d1e9ccbc7 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedNumber.java@@ -82,8 +82,12 @@ public class ProjectScopedNumber implements Serializable {return new HashCodeBuilder(17, 37).append(projectId).append(number).toHashCode();}+ public String getFQN() {+ return getProject().getPath() + "#" + getNumber();+ }@Overridepublic String toString() {- return getProject().getPath() + "#" + getNumber();+ return getFQN();}+}diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.javaindex b9ec3f3bd5..09b667fcb5 100644--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.java+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedRevision.java@@ -1,13 +1,14 @@package io.onedev.server.util;-import java.io.Serializable;--import javax.annotation.Nullable;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;++import javax.annotation.Nullable;+import java.io.Serializable;public class ProjectScopedRevision implements Serializable {@@ -48,5 +49,32 @@ public class ProjectScopedRevision implements Serializable {elsereturn null;}++ public String getFQN() {+ return getProject().getPath() + ":" + revision;+ }++ @Override+ public String toString() {+ return getFQN();+ }++ @Override+ public boolean equals(Object other) {+ if (!(other instanceof ProjectScopedRevision))+ return false;+ if (this == other)+ return true;+ ProjectScopedRevision projectScopedRevision = (ProjectScopedRevision) other;+ return new EqualsBuilder()+ .append(projectId, projectScopedRevision.projectId)+ .append(revision, projectScopedRevision.revision)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37).append(projectId).append(revision).toHashCode();+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoCssResourceReference.javanew file mode 100644index 0000000000..1db4ce1022--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.commit.info;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class CommitInfoCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public CommitInfoCssResourceReference() {+ super(CommitInfoCssResourceReference.class, "commit-info.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.htmlnew file mode 100644index 0000000000..95643d0ef1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.html@@ -0,0 +1,27 @@+<wicket:panel>+ <div class="commit-info d-flex align-items-start">+ <div class="avatar flex-shrink-0 mr-2">+ <span wicket:id="avatar"></span>+ </div>+ <div class="detail flex-grow-1 mr-3">+ <div wicket:id="message" class="message"></div>+ <div class="contribution">+ <div wicket:id="contribution"></div>+ <wicket:enclosure><div class="text-muted"> in <a wicket:id="project"></a></div></wicket:enclosure>+ </div>+ </div>+ <div class="d-none d-lg-block flex-shrink-0">+ <span class="btn-group mr-2">+ <a wicket:id="signature" class="btn btn-outline-secondary"></a>+ <a wicket:id="buildStatus" class="build-status btn btn-outline-secondary"></a>+ </span>+ <span class="btn-group hash mr-2">+ <a wicket:id="hashLink" class="btn btn-outline-secondary hash"><span wicket:id="hash"></span></a>+ <a wicket:id="copyHash" class="btn btn-icon btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>+ </span>+ <span class="btn-group browse">+ <a wicket:id="browseCode" title="Browse code" class="btn btn-icon btn-outline-secondary"><wicket:svg href="files" class="icon"></wicket:svg></a>+ </span>+ </div>+ </div>+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.javanew file mode 100644index 0000000000..d238d33824--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/info/CommitInfoPanel.java@@ -0,0 +1,132 @@+package io.onedev.server.web.component.commit.info;++import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.ProjectScopedCommit;+import io.onedev.server.web.component.commit.message.CommitMessagePanel;+import io.onedev.server.web.component.commit.status.CommitStatusLink;+import io.onedev.server.web.component.contributorpanel.ContributorPanel;+import io.onedev.server.web.component.gitsignature.GitSignaturePanel;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;+import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevObject;++public abstract class CommitInfoPanel extends GenericPanel<ProjectScopedCommit> {++ public CommitInfoPanel(String id, IModel<ProjectScopedCommit> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Project project = getCommit().getProject();+ String commitHash = getCommit().getCommitId().name();+ RevCommit revCommit = getCommit().getRevCommit();++ add(new ContributorAvatars("avatar", revCommit.getAuthorIdent(), revCommit.getCommitterIdent()));++ add(new CommitMessagePanel("message", new LoadableDetachableModel<RevCommit>() {++ @Override+ protected RevCommit load() {+ return getCommit().getRevCommit();+ }++ }) {++ @Override+ protected Project getProject() {+ return getCommit().getProject();+ }++ });++ add(new ContributorPanel("contribution", revCommit.getAuthorIdent(),+ revCommit.getCommitterIdent()));++ add(new BookmarkablePageLink<Void>("project", ProjectDashboardPage.class,+ ProjectDashboardPage.paramsOf(project)) {++ @Override+ public IModel<?> getBody() {+ return Model.of(getCommit().getProject().getPath());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getCommit().getProject().equals(getProject()));+ }++ });++ add(new GitSignaturePanel("signature") {++ @Override+ protected RevObject getRevObject() {+ return getCommit().getRevCommit();+ }++ });++ add(new CommitStatusLink("buildStatus", getCommit().getCommitId(), null) {++ @Override+ protected Project getProject() {+ return getCommit().getProject();+ }++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }++ });++ CommitDetailPage.State commitState = new CommitDetailPage.State();+ commitState.revision = commitHash;+ PageParameters params = CommitDetailPage.paramsOf(project, commitState);+ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);+ add(hashLink);+ hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commitHash)));+ add(new CopyToClipboardLink("copyHash", Model.of(commitHash)));++ BlobIdent blobIdent = new BlobIdent(commitHash, null, FileMode.TYPE_TREE);+ ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);+ params = ProjectBlobPage.paramsOf(project, browseState);+ add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new CommitInfoCssResourceReference()));+ }++ private ProjectScopedCommit getCommit() {+ return getModelObject();+ }++ protected abstract Project getProject();++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/info/commit-info.css b/server-core/src/main/java/io/onedev/server/web/component/commit/info/commit-info.cssnew file mode 100644index 0000000000..16aebe4829--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/info/commit-info.css@@ -0,0 +1,10 @@+.commit-info>.avatar {+ margin-top: 4px;+}+.commit-info .commit-message>.summary {+ font-weight: 600;+ font-size: 1.1rem;+}+.commit-info>.detail>.contribution>* {+ display: inline;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex d5f3985387..abf5aee57d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -9,15 +9,17 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.entityreference.ReferencedFromAware;import io.onedev.server.model.*;import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;+import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCommitData;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.facade.UserCache;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.behavior.WebSocketObserver;+import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.issue.activities.activity.IssueActivity;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.IssueOpenedActivity;-import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.page.simple.security.LoginPage;@@ -108,13 +110,12 @@ public abstract class IssueActivitiesPanel extends Panel {for (IssueChange change: getIssue().getChanges()) {if (change.getData() instanceof ReferencedFromAware) {ReferencedFromAware<?> referencedFromAware = (ReferencedFromAware<?>) change.getData();- if (referencedFromAware.getReferencedFrom() instanceof Issue) {- Issue issue = (Issue) referencedFromAware.getReferencedFrom();- if (SecurityUtils.canAccess(issue))- otherActivities.add(new IssueChangeActivity(change));- } else if (referencedFromAware.getReferencedFrom() != null) {+ if (ReferencedFromAware.canDisplay(referencedFromAware))+ otherActivities.add(new IssueChangeActivity(change));+ } else if (change.getData() instanceof IssueReferencedFromCommitData) {+ ProjectScopedCommit commit = ((IssueReferencedFromCommitData) change.getData()).getCommit();+ if (commit.canDisplay() && !getIssue().getCommits().contains(commit))otherActivities.add(new IssueChangeActivity(change));- }} else if (!(change.getData() instanceof IssueDescriptionChangeData)) {otherActivities.add(new IssueChangeActivity(change));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.htmlindex a88fc00ceb..5ee475fdd3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html@@ -1,29 +1,7 @@<wicket:panel><div class="issue-commits">- <div wicket:id="commits" class="commit d-flex align-items-start py-3">- <div class="avatar flex-shrink-0 mr-2">- <span wicket:id="avatar"></span>- </div>- <div class="detail flex-grow-1 mr-3">- <div wicket:id="message" class="message"></div>- <div class="contribution">- <div wicket:id="contribution"></div>- <wicket:enclosure><div class="text-muted"> in <a wicket:id="project"></a></div></wicket:enclosure>- </div>- </div>- <div class="d-none d-lg-block flex-shrink-0">- <span class="btn-group mr-2">- <a wicket:id="signature" class="btn btn-outline-secondary"></a>- <a wicket:id="buildStatus" class="build-status btn btn-outline-secondary"></a>- </span>- <span class="btn-group hash mr-2">- <a wicket:id="hashLink" class="btn btn-outline-secondary hash"><span wicket:id="hash"></span></a>- <a wicket:id="copyHash" class="btn btn-icon btn-outline-secondary"><wicket:svg href="copy" class="icon"></wicket:svg></a>- </span>- <span class="btn-group browse">- <a wicket:id="browseCode" title="Browse code" class="btn btn-icon btn-outline-secondary"><wicket:svg href="files" class="icon"></wicket:svg></a>- </span>- </div>+ <div wicket:id="commits" class="commit py-3">+ <wicket:container wicket:id="commit" class=""></wicket:container></div></div></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.javaindex 9144d0df05..12f87f059f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java@@ -1,41 +1,18 @@package io.onedev.server.web.component.issue.commits;-import java.util.List;--import org.apache.wicket.behavior.AttributeAppender;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.util.ProjectScopedCommit;+import io.onedev.server.web.component.commit.info.CommitInfoPanel;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevObject;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.git.GitUtils;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Issue.FixCommit;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.web.component.commit.message.CommitMessagePanel;-import io.onedev.server.web.component.commit.status.CommitStatusLink;-import io.onedev.server.web.component.contributorpanel.ContributorPanel;-import io.onedev.server.web.component.gitsignature.GitSignaturePanel;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;-import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import java.util.List;@SuppressWarnings("serial")public class IssueCommitsPanel extends GenericPanel<Issue> {@@ -48,96 +25,25 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {public void onInitialize() {super.onInitialize();- add(new ListView<FixCommit>("commits", new AbstractReadOnlyModel<List<FixCommit>>() {+ add(new ListView<ProjectScopedCommit>("commits", new AbstractReadOnlyModel<List<ProjectScopedCommit>>() {@Override- public List<FixCommit> getObject() {+ public List<ProjectScopedCommit> getObject() {return getIssue().getCommits();}}) {@Override- protected void populateItem(ListItem<FixCommit> item) {- FixCommit commit = item.getModelObject();- Project project = commit.getProject();- String commitHash = commit.getCommit().name();-- item.add(new ContributorAvatars("avatar", commit.getCommit().getAuthorIdent(),- commit.getCommit().getCommitterIdent()));-- item.add(new CommitMessagePanel("message", new LoadableDetachableModel<RevCommit>() {-- @Override- protected RevCommit load() {- return item.getModelObject().getCommit();- }-- }) {+ protected void populateItem(ListItem<ProjectScopedCommit> item) {+ item.add(new CommitInfoPanel("commit", item.getModel()) {@Overrideprotected Project getProject() {- return item.getModelObject().getProject();+ return getIssue().getProject();}});-- item.add(new ContributorPanel("contribution", commit.getCommit().getAuthorIdent(),- commit.getCommit().getCommitterIdent()));-- item.add(new BookmarkablePageLink<Void>("project", ProjectDashboardPage.class,- ProjectDashboardPage.paramsOf(project)) {-- @Override- public IModel<?> getBody() {- return Model.of(item.getModelObject().getProject().getPath());- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!item.getModelObject().getProject().equals(getIssue().getProject()));- }-- });-- item.add(new GitSignaturePanel("signature") {-- @Override- protected RevObject getRevObject() {- return item.getModelObject().getCommit();- }-- });-- item.add(new CommitStatusLink("buildStatus", commit.getCommit().copy(), null) {-- @Override- protected Project getProject() {- return item.getModelObject().getProject();- }-- @Override- protected PullRequest getPullRequest() {- return null;- }-- });-- CommitDetailPage.State commitState = new CommitDetailPage.State();- commitState.revision = commitHash;- PageParameters params = CommitDetailPage.paramsOf(project, commitState);- Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);- item.add(hashLink);- hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commitHash)));- item.add(new CopyToClipboardLink("copyHash", Model.of(commitHash)));-- BlobIdent blobIdent = new BlobIdent(commitHash, null, FileMode.TYPE_TREE);- ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);- params = ProjectBlobPage.paramsOf(project, browseState);- item.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));-- item.add(AttributeAppender.append("class", "commit"));}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.cssindex 4db234ebb0..1a52e2d246 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css@@ -4,13 +4,3 @@.issue-commits>.commit:first-child {border-top: none;}-.issue-commits>.commit>.avatar {- margin-top: 4px;-}-.issue-commits>.commit .commit-message>.summary {- font-weight: 600;- font-size: 1.1rem;-}-.issue-commits>.commit>.detail>.contribution>* {- display: inline;-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.javaindex 828a5af6b0..77a289f094 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java@@ -1,14 +1,32 @@package io.onedev.server.web.page.project.pullrequests.detail.activities;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Date;-import java.util.HashSet;-import java.util.List;-import java.util.stream.Collectors;--import javax.servlet.http.Cookie;-+import com.google.common.collect.Lists;+import com.google.common.collect.Sets;+import io.onedev.server.OneDev;+import io.onedev.server.attachment.AttachmentSupport;+import io.onedev.server.attachment.ProjectAttachmentSupport;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.PullRequestCommentManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.entityreference.ReferencedFromAware;+import io.onedev.server.model.*;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCommitData;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.ProjectScopedCommit;+import io.onedev.server.util.facade.UserCache;+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.behavior.WebSocketObserver;+import io.onedev.server.web.component.comment.CommentInput;+import io.onedev.server.web.component.svg.SpriteImage;+import io.onedev.server.web.component.user.ident.Mode;+import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;+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.simple.security.LoginPage;+import io.onedev.server.web.util.DeleteCallback;import org.apache.wicket.AttributeModifier;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;@@ -37,38 +55,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.ObjectId;import org.joda.time.DateTime;-import com.google.common.collect.Lists;-import com.google.common.collect.Sets;--import io.onedev.server.OneDev;-import io.onedev.server.attachment.AttachmentSupport;-import io.onedev.server.attachment.ProjectAttachmentSupport;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.PullRequestCommentManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.entityreference.ReferencedFromAware;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestChange;-import io.onedev.server.model.PullRequestComment;-import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.model.User;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.facade.UserCache;-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;-import io.onedev.server.web.behavior.WebSocketObserver;-import io.onedev.server.web.component.comment.CommentInput;-import io.onedev.server.web.component.svg.SpriteImage;-import io.onedev.server.web.component.user.ident.Mode;-import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;-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.simple.security.LoginPage;-import io.onedev.server.web.util.DeleteCallback;+import javax.servlet.http.Cookie;+import java.util.*;+import java.util.stream.Collectors;@SuppressWarnings("serial")public class PullRequestActivitiesPage extends PullRequestDetailPage {@@ -152,13 +141,12 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {for (PullRequestChange change: getPullRequest().getChanges()) {if (change.getData() instanceof ReferencedFromAware) {ReferencedFromAware<?> referencedFromAware = (ReferencedFromAware<?>) change.getData();- if (referencedFromAware.getReferencedFrom() instanceof Issue) {- Issue issue = (Issue) referencedFromAware.getReferencedFrom();- if (SecurityUtils.canAccess(issue))- otherActivities.add(new PullRequestChangeActivity(change));- } else if (referencedFromAware.getReferencedFrom() != null) {+ if (ReferencedFromAware.canDisplay(referencedFromAware))+ otherActivities.add(new PullRequestChangeActivity(change));+ } else if (change.getData() instanceof PullRequestReferencedFromCommitData) {+ ProjectScopedCommit commit = ((PullRequestReferencedFromCommitData) change.getData()).getCommit();+ if (commit.canDisplay() && getPullRequest().getUpdates().stream().noneMatch(it->it.getCommits().contains(commit.getCommitId())))otherActivities.add(new PullRequestChangeActivity(change));- }} else {otherActivities.add(new PullRequestChangeActivity(change));}