diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/api/v1/repo/issue.go | 70 |
1 files changed, 42 insertions, 28 deletions
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 1653b85940..0dbf2741ad 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -93,7 +93,6 @@ func SearchIssues(ctx *context.APIContext) { opts.AllLimited = true } - issueCount := 0 for page := 1; ; page++ { opts.Page = page repos, count, err := models.SearchRepositoryByName(opts) @@ -107,19 +106,12 @@ func SearchIssues(ctx *context.APIContext) { } log.Trace("Processing next %d repos of %d", len(repos), count) for _, repo := range repos { - switch isClosed { - case util.OptionalBoolTrue: - issueCount += repo.NumClosedIssues - case util.OptionalBoolFalse: - issueCount += repo.NumOpenIssues - case util.OptionalBoolNone: - issueCount += repo.NumIssues - } repoIDs = append(repoIDs, repo.ID) } } var issues []*models.Issue + var filteredCount int64 keyword := strings.Trim(ctx.Query("q"), " ") if strings.IndexByte(keyword, 0) >= 0 { @@ -129,7 +121,10 @@ func SearchIssues(ctx *context.APIContext) { var labelIDs []int64 var err error if len(keyword) > 0 && len(repoIDs) > 0 { - issueIDs, err = issue_indexer.SearchIssuesByKeyword(repoIDs, keyword) + if issueIDs, err = issue_indexer.SearchIssuesByKeyword(repoIDs, keyword); err != nil { + ctx.Error(http.StatusInternalServerError, "SearchIssuesByKeyword", err) + return + } } var isPull util.OptionalBool @@ -151,12 +146,11 @@ func SearchIssues(ctx *context.APIContext) { // Only fetch the issues if we either don't have a keyword or the search returned issues // This would otherwise return all issues if no issues were found by the search. if len(keyword) == 0 || len(issueIDs) > 0 || len(labelIDs) > 0 { - issues, err = models.Issues(&models.IssuesOptions{ + issuesOpt := &models.IssuesOptions{ ListOptions: models.ListOptions{ Page: ctx.QueryInt("page"), PageSize: setting.UI.IssuePagingNum, }, - RepoIDs: repoIDs, IsClosed: isClosed, IssueIDs: issueIDs, @@ -164,16 +158,24 @@ func SearchIssues(ctx *context.APIContext) { SortType: "priorityrepo", PriorityRepoID: ctx.QueryInt64("priority_repo_id"), IsPull: isPull, - }) - } + } - if err != nil { - ctx.Error(http.StatusInternalServerError, "Issues", err) - return + if issues, err = models.Issues(issuesOpt); err != nil { + ctx.Error(http.StatusInternalServerError, "Issues", err) + return + } + + issuesOpt.ListOptions = models.ListOptions{ + Page: -1, + } + if filteredCount, err = models.CountIssues(issuesOpt); err != nil { + ctx.Error(http.StatusInternalServerError, "CountIssues", err) + return + } } - ctx.SetLinkHeader(issueCount, setting.UI.IssuePagingNum) - ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", issueCount)) + ctx.SetLinkHeader(int(filteredCount), setting.UI.IssuePagingNum) + ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", filteredCount)) ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link") ctx.JSON(http.StatusOK, convert.ToAPIIssueList(issues)) } @@ -241,6 +243,7 @@ func ListIssues(ctx *context.APIContext) { } var issues []*models.Issue + var filteredCount int64 keyword := strings.Trim(ctx.Query("q"), " ") if strings.IndexByte(keyword, 0) >= 0 { @@ -251,6 +254,10 @@ func ListIssues(ctx *context.APIContext) { var err error if len(keyword) > 0 { issueIDs, err = issue_indexer.SearchIssuesByKeyword([]int64{ctx.Repo.Repository.ID}, keyword) + if err != nil { + ctx.Error(http.StatusInternalServerError, "SearchIssuesByKeyword", err) + return + } } if splitted := strings.Split(ctx.Query("labels"), ","); len(splitted) > 0 { @@ -306,7 +313,7 @@ func ListIssues(ctx *context.APIContext) { // Only fetch the issues if we either don't have a keyword or the search returned issues // This would otherwise return all issues if no issues were found by the search. if len(keyword) == 0 || len(issueIDs) > 0 || len(labelIDs) > 0 { - issues, err = models.Issues(&models.IssuesOptions{ + issuesOpt := &models.IssuesOptions{ ListOptions: listOptions, RepoIDs: []int64{ctx.Repo.Repository.ID}, IsClosed: isClosed, @@ -314,18 +321,25 @@ func ListIssues(ctx *context.APIContext) { LabelIDs: labelIDs, MilestoneIDs: mileIDs, IsPull: isPull, - }) - } + } - if err != nil { - ctx.Error(http.StatusInternalServerError, "Issues", err) - return + if issues, err = models.Issues(issuesOpt); err != nil { + ctx.Error(http.StatusInternalServerError, "Issues", err) + return + } + + issuesOpt.ListOptions = models.ListOptions{ + Page: -1, + } + if filteredCount, err = models.CountIssues(issuesOpt); err != nil { + ctx.Error(http.StatusInternalServerError, "CountIssues", err) + return + } } - ctx.SetLinkHeader(ctx.Repo.Repository.NumIssues, listOptions.PageSize) - ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", ctx.Repo.Repository.NumIssues)) + ctx.SetLinkHeader(int(filteredCount), listOptions.PageSize) + ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", filteredCount)) ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link") - ctx.JSON(http.StatusOK, convert.ToAPIIssueList(issues)) } |