TakeV/forgejo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix PR-webhook issue where Label-data is stale (#3486) (#3510)

Browse source 
* Fix PR-webhook issue where Label-data is stale

* Conventions \o/

* logs are nice if they're consistent...
This commit is contained in:
Kim "BKC" Carlbäcker 2016-08-24 21:01:30 +02:00 committed by 无闻
parent b710f6bd65
commit 06602a84ff
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
models/issue.go
View file

@ -235,7 +235,11 @@ func (i *Issue) HasLabel(labelID int64) bool {
func (issue *Issue) sendLabelUpdatedWebhook(doer *User) { func (issue *Issue) sendLabelUpdatedWebhook(doer *User) {
var err error var err error
if issue.IsPull { 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{ err = PrepareWebhooks(issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
Action: api.HOOK_ISSUE_LABEL_UPDATED, Action: api.HOOK_ISSUE_LABEL_UPDATED,
Index: issue.Index, Index: issue.Index,
@ -335,7 +339,11 @@ func (issue *Issue) ClearLabels(doer *User) (err error) {
} }
if issue.IsPull { 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{ err = PrepareWebhooks(issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
Action: api.HOOK_ISSUE_LABEL_CLEARED, Action: api.HOOK_ISSUE_LABEL_CLEARED,
Index: issue.Index, Index: issue.Index,