diff options
| author | Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> | 2020-06-21 10:22:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-21 16:22:06 +0800 |
| commit | 81324cf37c87d834137a3b5ebf287adeed513f18 (patch) | |
| tree | 918aa8464f8cbecd502105d98ec22d6062232533 /routers/api/v1/admin | |
| parent | a07cc0df76056ce2be1d8a89f38416cf511dd03b (diff) | |
| download | gitea-81324cf37c87d834137a3b5ebf287adeed513f18.tar.gz gitea-81324cf37c87d834137a3b5ebf287adeed513f18.zip | |
Add pagination headers on endpoints that support total count from database (#11145)
* begin work
* import fmt
* more work
* empty commit
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'routers/api/v1/admin')
| -rw-r--r-- | routers/api/v1/admin/org.go | 10 | ||||
| -rw-r--r-- | routers/api/v1/admin/user.go | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index fc2f81eb67..62d485d821 100644 --- a/routers/api/v1/admin/org.go +++ b/routers/api/v1/admin/org.go @@ -6,6 +6,7 @@ package admin import ( + "fmt" "net/http" "code.gitea.io/gitea/models" @@ -101,10 +102,12 @@ func GetAllOrgs(ctx *context.APIContext) { // "403": // "$ref": "#/responses/forbidden" - users, _, err := models.SearchUsers(&models.SearchUserOptions{ + listOptions := utils.GetListOptions(ctx) + + users, maxResults, err := models.SearchUsers(&models.SearchUserOptions{ Type: models.UserTypeOrganization, OrderBy: models.SearchOrderByAlphabetically, - ListOptions: utils.GetListOptions(ctx), + ListOptions: listOptions, Visible: []api.VisibleType{api.VisibleTypePublic, api.VisibleTypeLimited, api.VisibleTypePrivate}, }) if err != nil { @@ -115,5 +118,8 @@ func GetAllOrgs(ctx *context.APIContext) { for i := range users { orgs[i] = convert.ToOrganization(users[i]) } + + ctx.SetLinkHeader(int(maxResults), listOptions.PageSize) + ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults)) ctx.JSON(http.StatusOK, &orgs) } diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index f416ea9567..153ce66d76 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -351,10 +351,12 @@ func GetAllUsers(ctx *context.APIContext) { // "403": // "$ref": "#/responses/forbidden" - users, _, err := models.SearchUsers(&models.SearchUserOptions{ + listOptions := utils.GetListOptions(ctx) + + users, maxResults, err := models.SearchUsers(&models.SearchUserOptions{ Type: models.UserTypeIndividual, OrderBy: models.SearchOrderByAlphabetically, - ListOptions: utils.GetListOptions(ctx), + ListOptions: listOptions, }) if err != nil { ctx.Error(http.StatusInternalServerError, "GetAllUsers", err) @@ -366,5 +368,7 @@ func GetAllUsers(ctx *context.APIContext) { results[i] = convert.ToUser(users[i], ctx.IsSigned, ctx.User.IsAdmin) } + ctx.SetLinkHeader(int(maxResults), listOptions.PageSize) + ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults)) ctx.JSON(http.StatusOK, &results) } |