diff options
| author | 6543 <6543@obermui.de> | 2021-08-12 14:43:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 14:43:08 +0200 |
| commit | 2289580bb7ef8dfa4124c2b3bfb89897dbb35f46 (patch) | |
| tree | e68aae604bb3d738b44156504a1415adaf042c68 /models/oauth2_application.go | |
| parent | ca13e1d56c561f72cf8ad251fe61b1898abfec51 (diff) | |
| download | gitea-2289580bb7ef8dfa4124c2b3bfb89897dbb35f46.tar.gz gitea-2289580bb7ef8dfa4124c2b3bfb89897dbb35f46.zip | |
[API] generalize list header (#16551)
* Add info about list endpoints to CONTRIBUTING.md
* Let all list endpoints return X-Total-Count header
* Add TODOs for GetCombinedCommitStatusByRef
* Fix models/issue_stopwatch.go
* Rrefactor models.ListDeployKeys
* Introduce helper func and use them for SetLinkHeader related func
Diffstat (limited to 'models/oauth2_application.go')
| -rw-r--r-- | models/oauth2_application.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/models/oauth2_application.go b/models/oauth2_application.go index 2aa9fbd3d9..9cf236f0cb 100644 --- a/models/oauth2_application.go +++ b/models/oauth2_application.go @@ -269,7 +269,7 @@ func DeleteOAuth2Application(id, userid int64) error { } // ListOAuth2Applications returns a list of oauth2 applications belongs to given user. -func ListOAuth2Applications(uid int64, listOptions ListOptions) ([]*OAuth2Application, error) { +func ListOAuth2Applications(uid int64, listOptions ListOptions) ([]*OAuth2Application, int64, error) { sess := x. Where("uid=?", uid). Desc("id") @@ -278,11 +278,13 @@ func ListOAuth2Applications(uid int64, listOptions ListOptions) ([]*OAuth2Applic sess = listOptions.setSessionPagination(sess) apps := make([]*OAuth2Application, 0, listOptions.PageSize) - return apps, sess.Find(&apps) + total, err := sess.FindAndCount(&apps) + return apps, total, err } apps := make([]*OAuth2Application, 0, 5) - return apps, sess.Find(&apps) + total, err := sess.FindAndCount(&apps) + return apps, total, err } ////////////////////////////////////////////////////// |