diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-09-24 19:32:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 19:32:56 +0800 |
| commit | 5842a55b3103d3f09751eb7b3b049415197debad (patch) | |
| tree | f4c0ab5d74f4bcfaf416cc9a592ee7f743be7dc5 /routers/web/user/setting/keys.go | |
| parent | 4a2655098fd1a594c7d33a144932bb5ec2fd7cd9 (diff) | |
| download | gitea-5842a55b3103d3f09751eb7b3b049415197debad.tar.gz gitea-5842a55b3103d3f09751eb7b3b049415197debad.zip | |
Move login related structs and functions to models/login (#17093)
* Move login related structs and functions to models/login
* Fix test
* Fix lint
* Fix lint
* Fix lint of windows
* Fix lint
* Fix test
* Fix test
* Only load necessary fixtures when preparing unit tests envs
* Fix lint
* Fix test
* Fix test
* Fix error log
* Fix error log
* Fix error log
* remove unnecessary change
* fix error log
* merge main branch
Diffstat (limited to 'routers/web/user/setting/keys.go')
| -rw-r--r-- | routers/web/user/setting/keys.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go index 24b9a9e205..bb7a50841b 100644 --- a/routers/web/user/setting/keys.go +++ b/routers/web/user/setting/keys.go @@ -9,6 +9,7 @@ import ( "net/http" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" @@ -233,7 +234,7 @@ func DeleteKey(ctx *context.Context) { } func loadKeysData(ctx *context.Context) { - keys, err := models.ListPublicKeys(ctx.User.ID, models.ListOptions{}) + keys, err := models.ListPublicKeys(ctx.User.ID, db.ListOptions{}) if err != nil { ctx.ServerError("ListPublicKeys", err) return @@ -247,7 +248,7 @@ func loadKeysData(ctx *context.Context) { } ctx.Data["ExternalKeys"] = externalKeys - gpgkeys, err := models.ListGPGKeys(ctx.User.ID, models.ListOptions{}) + gpgkeys, err := models.ListGPGKeys(ctx.User.ID, db.ListOptions{}) if err != nil { ctx.ServerError("ListGPGKeys", err) return @@ -258,7 +259,7 @@ func loadKeysData(ctx *context.Context) { // generate a new aes cipher using the csrfToken ctx.Data["TokenToSign"] = tokenToSign - principals, err := models.ListPrincipalKeys(ctx.User.ID, models.ListOptions{}) + principals, err := models.ListPrincipalKeys(ctx.User.ID, db.ListOptions{}) if err != nil { ctx.ServerError("ListPrincipalKeys", err) return |