From 35d9e94d93444791664a52cd18ea7b89b083fe41 Mon Sep 17 00:00:00 2001 From: Kurt Madel Date: Sat, 27 Aug 2016 07:46:02 -0400 Subject: [PATCH 1/3] messing with getting local go-gogs-client --- models/pull.go | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/models/pull.go b/models/pull.go index fa9a44897a295..8a06f26f6fc9b 100644 --- a/models/pull.go +++ b/models/pull.go @@ -114,18 +114,22 @@ func (pr *PullRequest) LoadIssue() (err error) { func (pr *PullRequest) APIFormat() *api.PullRequest { apiIssue := pr.Issue.APIFormat() apiPullRequest := &api.PullRequest{ - ID: pr.ID, - Index: pr.Index, - Poster: apiIssue.Poster, - Title: apiIssue.Title, - Body: apiIssue.Body, - Labels: apiIssue.Labels, - Milestone: apiIssue.Milestone, - Assignee: apiIssue.Assignee, - State: apiIssue.State, - Comments: apiIssue.Comments, - HTMLURL: pr.Issue.HTMLURL(), - HasMerged: pr.HasMerged, + ID: pr.ID, + Index: pr.Index, + Poster: apiIssue.Poster, + Title: apiIssue.Title, + Body: apiIssue.Body, + Labels: apiIssue.Labels, + Milestone: apiIssue.Milestone, + Assignee: apiIssue.Assignee, + State: apiIssue.State, + Comments: apiIssue.Comments, + HTMLURL: pr.Issue.HTMLURL(), + HasMerged: pr.HasMerged, + HeadBranch: pr.HeadBranch, + HeadRepo: pr.HeadRepo.APIFormat(nil), + BaseBranch: pr.BaseBranch, + BaseRepo: pr.BaseRepo.APIFormat(nil), } if pr.Status != PULL_REQUEST_STATUS_CHECKING { From 324327eee031d92afdadde0da7b65ca1f095acd3 Mon Sep 17 00:00:00 2001 From: Kurt Madel Date: Tue, 30 Aug 2016 09:01:41 -0400 Subject: [PATCH 2/3] coding style fix --- models/pull.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/pull.go b/models/pull.go index 8a06f26f6fc9b..3612b01730317 100644 --- a/models/pull.go +++ b/models/pull.go @@ -124,12 +124,12 @@ func (pr *PullRequest) APIFormat() *api.PullRequest { Assignee: apiIssue.Assignee, State: apiIssue.State, Comments: apiIssue.Comments, - HTMLURL: pr.Issue.HTMLURL(), - HasMerged: pr.HasMerged, HeadBranch: pr.HeadBranch, HeadRepo: pr.HeadRepo.APIFormat(nil), BaseBranch: pr.BaseBranch, BaseRepo: pr.BaseRepo.APIFormat(nil), + HTMLURL: pr.Issue.HTMLURL(), + HasMerged: pr.HasMerged, } if pr.Status != PULL_REQUEST_STATUS_CHECKING { From bf5d76c10ca6042a4e64df49d52a8cbd5e4a8ee7 Mon Sep 17 00:00:00 2001 From: Kurt Madel Date: Tue, 30 Aug 2016 18:58:23 -0400 Subject: [PATCH 3/3] added comments for required fields --- models/pull.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/models/pull.go b/models/pull.go index 3612b01730317..5ae65989a1759 100644 --- a/models/pull.go +++ b/models/pull.go @@ -110,6 +110,8 @@ func (pr *PullRequest) LoadIssue() (err error) { // This method assumes following fields have been assigned with valid values: // Required - Issue +// Required - HeadRepo +// Required - BaseRepo // Optional - Merger func (pr *PullRequest) APIFormat() *api.PullRequest { apiIssue := pr.Issue.APIFormat()