api/issue: minor code refactor ()

pull/4121/head
Unknwon 2017-02-12 19:46:38 -05:00
parent 99d86c7175
commit 1c87b082c1
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
2 changed files with 20 additions and 18 deletions
models
routers/api/v1/repo

View File

@ -813,6 +813,7 @@ type IssuesOptions struct {
SortType string SortType string
} }
// buildIssuesQuery returns nil if it foresees there won't be any value returned.
func buildIssuesQuery(opts *IssuesOptions) *xorm.Session { func buildIssuesQuery(opts *IssuesOptions) *xorm.Session {
sess := x.NewSession() sess := x.NewSession()

View File

@ -15,30 +15,13 @@ import (
"github.com/gogits/gogs/modules/setting" "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) { func listIssues(ctx *context.APIContext, opts *models.IssuesOptions) {
issues, err := models.Issues(opts) issues, err := models.Issues(opts)
if err != nil { if err != nil {
ctx.Error(500, "Issues", err) ctx.Error(500, "Issues", err)
return return
} }
count, err := models.IssuesCount(opts) count, err := models.IssuesCount(opts)
if err != nil { if err != nil {
ctx.Error(500, "IssuesCount", err) ctx.Error(500, "IssuesCount", err)
@ -59,6 +42,24 @@ func listIssues(ctx *context.APIContext, opts *models.IssuesOptions) {
ctx.JSON(200, &apiIssues) 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) { func GetIssue(ctx *context.APIContext) {
issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
if err != nil { if err != nil {