From 1c87b082c1545a02293e08773f402b19f1ebaffe Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 12 Feb 2017 19:46:38 -0500 Subject: api/issue: minor code refactor (#3688) --- routers/api/v1/repo/issue.go | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'routers/api') diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 059c6f74..7b823e9e 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -15,30 +15,13 @@ import ( "github.com/gogits/gogs/modules/setting" ) -func ListUserIssues(ctx *context.APIContext) { - opts := models.IssuesOptions{ - AssigneeID: ctx.User.ID, - Page: ctx.QueryInt("page"), - } - - listIssues(ctx, &opts) -} - -func ListIssues(ctx *context.APIContext) { - opts := models.IssuesOptions{ - RepoID: ctx.Repo.Repository.ID, - Page: ctx.QueryInt("page"), - } - - listIssues(ctx, &opts) -} - func listIssues(ctx *context.APIContext, opts *models.IssuesOptions) { issues, err := models.Issues(opts) if err != nil { ctx.Error(500, "Issues", err) return } + count, err := models.IssuesCount(opts) if err != nil { ctx.Error(500, "IssuesCount", err) @@ -59,6 +42,24 @@ func listIssues(ctx *context.APIContext, opts *models.IssuesOptions) { ctx.JSON(200, &apiIssues) } +func ListUserIssues(ctx *context.APIContext) { + opts := models.IssuesOptions{ + AssigneeID: ctx.User.ID, + Page: ctx.QueryInt("page"), + } + + listIssues(ctx, &opts) +} + +func ListIssues(ctx *context.APIContext) { + opts := models.IssuesOptions{ + RepoID: ctx.Repo.Repository.ID, + Page: ctx.QueryInt("page"), + } + + listIssues(ctx, &opts) +} + func GetIssue(ctx *context.APIContext) { issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { -- cgit v1.2.3