Fix wrong milestone in webhook message (#11596) (#11612)

gary-kim · web-flow · commit a854846f0679 · 2020-05-25T00:03:02.000+01:00
Backport of #11596 Signed-off-by: Gary Kim <gary@garykim.dev>
diff --git a/models/issue.go b/models/issue.go
@@ -241,7 +241,7 @@ func (issue *Issue) loadReactions(e Engine) (err error) {
 }
 
 func (issue *Issue) loadMilestone(e Engine) (err error) {
-	if issue.Milestone == nil && issue.MilestoneID > 0 {
+	if (issue.Milestone == nil || issue.Milestone.ID != issue.MilestoneID) && issue.MilestoneID > 0 {
 		issue.Milestone, err = getMilestoneByRepoID(e, issue.RepoID, issue.MilestoneID)
 		if err != nil && !IsErrMilestoneNotExist(err) {
 			return fmt.Errorf("getMilestoneByRepoID [repo_id: %d, milestone_id: %d]: %v", issue.RepoID, issue.MilestoneID, err)

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ func (issue *Issue) loadReactions(e Engine) (err error) {`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`func (issue *Issue) loadMilestone(e Engine) (err error) {`
`244`		`- if issue.Milestone == nil && issue.MilestoneID > 0 {`
	`244`	`+ if (issue.Milestone == nil \|\| issue.Milestone.ID != issue.MilestoneID) && issue.MilestoneID > 0 {`
`245`	`245`	`issue.Milestone, err = getMilestoneByRepoID(e, issue.RepoID, issue.MilestoneID)`
`246`	`246`	`if err != nil && !IsErrMilestoneNotExist(err) {`
`247`	`247`	`return fmt.Errorf("getMilestoneByRepoID [repo_id: %d, milestone_id: %d]: %v", issue.RepoID, issue.MilestoneID, err)`