From 06602a84ff0ed352c8998cc3ca9ff0350e0906ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Wed, 24 Aug 2016 21:01:30 +0200 Subject: [PATCH] Fix PR-webhook issue where Label-data is stale (#3486) (#3510) * Fix PR-webhook issue where Label-data is stale * Conventions \o/ * logs are nice if they're consistent... --- models/issue.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/models/issue.go b/models/issue.go index 3e19d11907..6bbc0f8714 100644 --- a/models/issue.go +++ b/models/issue.go @@ -235,7 +235,11 @@ func (i *Issue) HasLabel(labelID int64) bool { func (issue *Issue) sendLabelUpdatedWebhook(doer *User) { var err error if issue.IsPull { - issue.PullRequest.Issue = issue + err = issue.PullRequest.LoadIssue() + if err != nil { + log.Error(4, "LoadIssue: %v", err) + return + } err = PrepareWebhooks(issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{ Action: api.HOOK_ISSUE_LABEL_UPDATED, Index: issue.Index, @@ -335,7 +339,11 @@ func (issue *Issue) ClearLabels(doer *User) (err error) { } if issue.IsPull { - issue.PullRequest.Issue = issue + err = issue.PullRequest.LoadIssue() + if err != nil { + log.Error(4, "LoadIssue: %v", err) + return + } err = PrepareWebhooks(issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{ Action: api.HOOK_ISSUE_LABEL_CLEARED, Index: issue.Index,