diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2024-12-19 07:10:08 +0100 |
|---|---|---|
| committer | Earl Warren <contact@earl-warren.org> | 2024-12-22 08:46:38 +0100 |
| commit | a5399b473f7111c92b2645076d02a7f427e16f08 (patch) | |
| tree | 7f2c6f18dc6451f7850abb4db6470ccd3235d67c /services | |
| parent | Improve Actions status aggregations (#32860) (diff) | |
| download | forgejo-a5399b473f7111c92b2645076d02a7f427e16f08.tar.xz forgejo-a5399b473f7111c92b2645076d02a7f427e16f08.zip | |
Add more load functions to make sure the reference object loaded (#32901)
Fix #32897
(cherry picked from commit dc8f59baa54d4f47edab6feb76a6903947584326)
Diffstat (limited to 'services')
| -rw-r--r-- | services/convert/pull.go | 5 | ||||
| -rw-r--r-- | services/webhook/notifier.go | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/services/convert/pull.go b/services/convert/pull.go index 4ec24a8276..70dc22445a 100644 --- a/services/convert/pull.go +++ b/services/convert/pull.go @@ -29,6 +29,11 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u err error ) + if err = pr.LoadIssue(ctx); err != nil { + log.Error("pr.LoadIssue[%d]: %v", pr.ID, err) + return nil + } + if err = pr.Issue.LoadRepo(ctx); err != nil { log.Error("pr.Issue.LoadRepo[%d]: %v", pr.ID, err) return nil diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go index 8bfd03024f..fed33d8008 100644 --- a/services/webhook/notifier.go +++ b/services/webhook/notifier.go @@ -409,6 +409,10 @@ func (m *webhookNotifier) CreateIssueComment(ctx context.Context, doer *user_mod var pullRequest *api.PullRequest if issue.IsPull { eventType = webhook_module.HookEventPullRequestComment + if err := issue.LoadPullRequest(ctx); err != nil { + log.Error("LoadPullRequest: %v", err) + return + } pullRequest = convert.ToAPIPullRequest(ctx, issue.PullRequest, doer) } else { eventType = webhook_module.HookEventIssueComment |