diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-11 15:03:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 15:03:30 +0800 |
| commit | 90eb9fb889e5d3a5845576dbc63e3792f3da33f2 (patch) | |
| tree | 4107df9dd446fe9a93e49cba1e59d0f721e70351 /routers/api/v1/admin | |
| parent | 492e1c2fbd1b646f4428207942a9f89b56f7b6a9 (diff) | |
| download | gitea-90eb9fb889e5d3a5845576dbc63e3792f3da33f2.tar.gz gitea-90eb9fb889e5d3a5845576dbc63e3792f3da33f2.zip | |
Move EmailAddress & UserRedirect into models/user/ (#17607)
* Move EmailAddress into models/user/
* Fix test
* rename user_mail to user_email
* Fix test
* Move UserRedirect into models/user/
* Fix lint & test
* Fix lint
* Fix lint
* remove nolint comment
* Fix lint
Diffstat (limited to 'routers/api/v1/admin')
| -rw-r--r-- | routers/api/v1/admin/user.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 2d585b6040..1e4a2851c2 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/login" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/log" @@ -109,10 +110,10 @@ func CreateUser(ctx *context.APIContext) { if err := models.CreateUser(u, overwriteDefault); err != nil { if models.IsErrUserAlreadyExist(err) || - models.IsErrEmailAlreadyUsed(err) || + user_model.IsErrEmailAlreadyUsed(err) || models.IsErrNameReserved(err) || models.IsErrNameCharsNotAllowed(err) || - models.IsErrEmailInvalid(err) || + user_model.IsErrEmailInvalid(err) || models.IsErrNamePatternNotAllowed(err) { ctx.Error(http.StatusUnprocessableEntity, "", err) } else { @@ -245,7 +246,7 @@ func EditUser(ctx *context.APIContext) { } if err := models.UpdateUser(u); err != nil { - if models.IsErrEmailAlreadyUsed(err) || models.IsErrEmailInvalid(err) { + if user_model.IsErrEmailAlreadyUsed(err) || user_model.IsErrEmailInvalid(err) { ctx.Error(http.StatusUnprocessableEntity, "", err) } else { ctx.Error(http.StatusInternalServerError, "UpdateUser", err) |