thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Small refactor for loading PRs (#22652)

Browse source
This commit is contained in:
Lunny Xiao 2023-02-02 11:49:28 +08:00 committed by GitHub
parent 3f2e721372
commit 4e946e5a7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
models/issues/pull_list.go
View file

@ -173,8 +173,9 @@ func (prs PullRequestList) loadAttributes(ctx context.Context) error {
for i := range issues { for i := range issues {
set[issues[i].ID] = issues[i] set[issues[i].ID] = issues[i]
} }
for i := range prs { for _, pr := range prs {
prs[i].Issue = set[prs[i].IssueID] pr.Issue = set[pr.IssueID]
pr.Issue.PullRequest = pr // panic here means issueIDs and prs are not in sync
} }
return nil return nil
} }

1
services/pull/pull.go
View file

@ -298,7 +298,6 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string,
} }
} }
pr.Issue.PullRequest = pr
notification.NotifyPullRequestSynchronized(ctx, doer, pr) notification.NotifyPullRequestSynchronized(ctx, doer, pr)
} }
} }