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

gary-kim · zeripath · techknowlogick · web-flow · commit eb5ea5f67a9f · 2020-05-25T01:01:49.000-04:00
Backport of #11596 Signed-off-by: Gary Kim <gary@garykim.dev> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
diff --git a/models/issue.go b/models/issue.go
@@ -249,7 +249,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
`@@ -249,7 +249,7 @@ func (issue *Issue) loadReactions(e Engine) (err error) {`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`func (issue *Issue) loadMilestone(e Engine) (err error) {`
`252`		`- if issue.Milestone == nil && issue.MilestoneID > 0 {`
	`252`	`+ if (issue.Milestone == nil \|\| issue.Milestone.ID != issue.MilestoneID) && issue.MilestoneID > 0 {`
`253`	`253`	`issue.Milestone, err = getMilestoneByRepoID(e, issue.RepoID, issue.MilestoneID)`
`254`	`254`	`if err != nil && !IsErrMilestoneNotExist(err) {`
`255`	`255`	`return fmt.Errorf("getMilestoneByRepoID [repo_id: %d, milestone_id: %d]: %v", issue.RepoID, issue.MilestoneID, err)`