Small refactor for loading PRs (go-gitea#22652)

zjjhot · Feb 2, 2023 · 4e946e5 · 4e946e5
1 parent 3f2e721
commit 4e946e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go
@@ -173,8 +173,9 @@ func (prs PullRequestList) loadAttributes(ctx context.Context) error {
 	for i := range issues {
 		set[issues[i].ID] = issues[i]
 	}
-	for i := range prs {
-		prs[i].Issue = set[prs[i].IssueID]
+	for _, pr := range prs {
+		pr.Issue = set[pr.IssueID]
+		pr.Issue.PullRequest = pr // panic here means issueIDs and prs are not in sync
 	}
 	return nil
 }

diff --git a/services/pull/pull.go b/services/pull/pull.go
@@ -298,7 +298,6 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string,
 						}
 					}
 
-					pr.Issue.PullRequest = pr
 					notification.NotifyPullRequestSynchronized(ctx, doer, pr)
 				}
 			}
-Original file line number
+Diff line change
@@ Expand Up @@
     						}
     					}
-    					pr.Issue.PullRequest = pr
     					notification.NotifyPullRequestSynchronized(ctx, doer, pr)
     				}
     			}
@@ Expand Down @@