Load milestone in API PR list (#9671)

jolheiser · lafriks · lunny · techknowlogick · commit 480ef9d410a5 · 2020-01-10T16:17:56.000-05:00
* Load milestone for Issue API format

Signed-off-by: jolheiser &lt;john.olheiser@gmail.com&gt;

* Move further down

Signed-off-by: jolheiser &lt;john.olheiser@gmail.com&gt;

Co-authored-by: Lauris BH &lt;lauris@nix.lv&gt;
Co-authored-by: Lunny Xiao &lt;xiaolunwen@gmail.com&gt;
Co-authored-by: techknowlogick &lt;matti@mdranta.net&gt;
diff --git a/models/issue.go b/models/issue.go
@@ -403,11 +403,12 @@ func (issue *Issue) apiFormat(e Engine) *api.Issue {
 		apiIssue.Closed = issue.ClosedUnix.AsTimePtr()
 	}
 
+	issue.loadMilestone(e)
 	if issue.Milestone != nil {
 		apiIssue.Milestone = issue.Milestone.APIFormat()
 	}
-	issue.loadAssignees(e)
 
+	issue.loadAssignees(e)
 	if len(issue.Assignees) > 0 {
 		for _, assignee := range issue.Assignees {
 			apiIssue.Assignees = append(apiIssue.Assignees, assignee.APIFormat())

Original file line number	Diff line number	Diff line change
`@@ -403,11 +403,12 @@ func (issue Issue) apiFormat(e Engine) api.Issue {`
`403`	`403`	`apiIssue.Closed = issue.ClosedUnix.AsTimePtr()`
`404`	`404`	`}`
`405`	`405`
	`406`	`+ issue.loadMilestone(e)`
`406`	`407`	`if issue.Milestone != nil {`
`407`	`408`	`apiIssue.Milestone = issue.Milestone.APIFormat()`
`408`	`409`	`}`
`409`		`- issue.loadAssignees(e)`
`410`	`410`
	`411`	`+ issue.loadAssignees(e)`
`411`	`412`	`if len(issue.Assignees) > 0 {`
`412`	`413`	`for _, assignee := range issue.Assignees {`
`413`	`414`	`apiIssue.Assignees = append(apiIssue.Assignees, assignee.APIFormat())`