Skip to content

Commit a4291fd

Browse files
GiteaBotlunny
andauthored
Add more load functions to make sure the reference object loaded (#32901) (#32912)
Backport #32901 by @lunny Fix #32897 Co-authored-by: Lunny Xiao <[email protected]>
1 parent fa5a064 commit a4291fd

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

Diff for: services/convert/pull.go

+5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
3131
err error
3232
)
3333

34+
if err = pr.LoadIssue(ctx); err != nil {
35+
log.Error("pr.LoadIssue[%d]: %v", pr.ID, err)
36+
return nil
37+
}
38+
3439
if err = pr.Issue.LoadRepo(ctx); err != nil {
3540
log.Error("pr.Issue.LoadRepo[%d]: %v", pr.ID, err)
3641
return nil

Diff for: services/webhook/notifier.go

+4
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,10 @@ func (m *webhookNotifier) CreateIssueComment(ctx context.Context, doer *user_mod
410410
var pullRequest *api.PullRequest
411411
if issue.IsPull {
412412
eventType = webhook_module.HookEventPullRequestComment
413+
if err := issue.LoadPullRequest(ctx); err != nil {
414+
log.Error("LoadPullRequest: %v", err)
415+
return
416+
}
413417
pullRequest = convert.ToAPIPullRequest(ctx, issue.PullRequest, doer)
414418
} else {
415419
eventType = webhook_module.HookEventIssueComment

0 commit comments

Comments
 (0)