Skip to content

The Unified and Autonomous Development Platform

fix: Exception when show issues referenced by other deleted issues (OD-2402)

Robin Shen11edcf54add1
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.java
index b7fc2d542c..1fbfc7aa0c 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
@@ -39,6 +39,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
import io.onedev.server.attachment.ProjectAttachmentSupport;
import io.onedev.server.entitymanager.IssueCommentManager;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
@@ -129,7 +130,13 @@ public abstract class IssueActivitiesPanel extends Panel {
&& !(change.getData() instanceof IssueOwnSpentTimeChangeData)
&& !(change.getData() instanceof IssueTotalSpentTimeChangeData)
&& !(change.getData() instanceof IssueOwnEstimatedTimeChangeData && !canAccessTimeTracking(project))) {
- otherActivities.add(new IssueChangeActivity(change));
+ if (change.getData() instanceof ReferencedFromAware) {
+ var referencedFromAware = (ReferencedFromAware<?>) change.getData();
+ if (ReferencedFromAware.canDisplay(referencedFromAware))
+ otherActivities.add(new IssueChangeActivity(change));
+ } else {
+ otherActivities.add(new IssueChangeActivity(change));
+ }
}
}
}
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.java
index b3185c5457..f93ef25450 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
@@ -134,7 +134,13 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
for (PullRequestChange change: getPullRequest().getChanges()) {
if (!(change.getData() instanceof ReferencedFromAware)
&& !(change.getData() instanceof PullRequestDescriptionChangeData)) {
- otherActivities.add(new PullRequestChangeActivity(change));
+ if (change.getData() instanceof ReferencedFromAware) {
+ var referencedFromAware = (ReferencedFromAware<?>) change.getData();
+ if (ReferencedFromAware.canDisplay(referencedFromAware))
+ otherActivities.add(new PullRequestChangeActivity(change));
+ } else {
+ otherActivities.add(new PullRequestChangeActivity(change));
+ }
}
}
}