From 6d3fd98f708419b33bc58e32474a9f95b65f4230 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Thu, 9 Jan 2020 11:49:27 -0600 Subject: [PATCH 1/2] Load milestone for Issue API format Signed-off-by: jolheiser --- models/issue.go | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/models/issue.go b/models/issue.go index aeeb70d27b9b0..dd8470ff94814 100644 --- a/models/issue.go +++ b/models/issue.go @@ -376,21 +376,23 @@ func (issue *Issue) apiFormat(e Engine) *api.Issue { apiLabels[i] = issue.Labels[i].APIFormat() } + issue.loadMilestone(e) issue.loadPoster(e) issue.loadRepo(e) apiIssue := &api.Issue{ - ID: issue.ID, - URL: issue.APIURL(), - HTMLURL: issue.HTMLURL(), - Index: issue.Index, - Poster: issue.Poster.APIFormat(), - Title: issue.Title, - Body: issue.Content, - Labels: apiLabels, - State: issue.State(), - Comments: issue.NumComments, - Created: issue.CreatedUnix.AsTime(), - Updated: issue.UpdatedUnix.AsTime(), + ID: issue.ID, + URL: issue.APIURL(), + HTMLURL: issue.HTMLURL(), + Index: issue.Index, + Poster: issue.Poster.APIFormat(), + Title: issue.Title, + Body: issue.Content, + Labels: apiLabels, + Milestone: issue.Milestone.APIFormat(), + State: issue.State(), + Comments: issue.NumComments, + Created: issue.CreatedUnix.AsTime(), + Updated: issue.UpdatedUnix.AsTime(), } apiIssue.Repo = &api.RepositoryMeta{ From 1ed18f85fc586307b1bb141b51648f89b6ecb633 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Thu, 9 Jan 2020 12:19:24 -0600 Subject: [PATCH 2/2] Move further down Signed-off-by: jolheiser --- models/issue.go | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/models/issue.go b/models/issue.go index dd8470ff94814..25765292ae3b1 100644 --- a/models/issue.go +++ b/models/issue.go @@ -376,23 +376,21 @@ func (issue *Issue) apiFormat(e Engine) *api.Issue { apiLabels[i] = issue.Labels[i].APIFormat() } - issue.loadMilestone(e) issue.loadPoster(e) issue.loadRepo(e) apiIssue := &api.Issue{ - ID: issue.ID, - URL: issue.APIURL(), - HTMLURL: issue.HTMLURL(), - Index: issue.Index, - Poster: issue.Poster.APIFormat(), - Title: issue.Title, - Body: issue.Content, - Labels: apiLabels, - Milestone: issue.Milestone.APIFormat(), - State: issue.State(), - Comments: issue.NumComments, - Created: issue.CreatedUnix.AsTime(), - Updated: issue.UpdatedUnix.AsTime(), + ID: issue.ID, + URL: issue.APIURL(), + HTMLURL: issue.HTMLURL(), + Index: issue.Index, + Poster: issue.Poster.APIFormat(), + Title: issue.Title, + Body: issue.Content, + Labels: apiLabels, + State: issue.State(), + Comments: issue.NumComments, + Created: issue.CreatedUnix.AsTime(), + Updated: issue.UpdatedUnix.AsTime(), } apiIssue.Repo = &api.RepositoryMeta{ @@ -405,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())