diff options
| author | Unknwon <u@gogs.io> | 2015-03-26 17:11:47 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-03-26 17:11:47 -0400 |
| commit | 698b9e2acc4daafe7d2b314e2d8c96545dde9c40 (patch) | |
| tree | 8d593bb0816503494de4deb16ee0fa6b95eb3c5c /routers/admin | |
| parent | d76f11c6f14b69bf981e5fc3901cc2c6445773b8 (diff) | |
| download | gitea-698b9e2acc4daafe7d2b314e2d8c96545dde9c40.tar.gz gitea-698b9e2acc4daafe7d2b314e2d8c96545dde9c40.zip | |
#1070 Clearer error message for illegal characters
Diffstat (limited to 'routers/admin')
| -rw-r--r-- | routers/admin/users.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/routers/admin/users.go b/routers/admin/users.go index ddd12a8b22..ddcca6390e 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -106,16 +106,19 @@ func NewUserPost(ctx *middleware.Context, form auth.RegisterForm) { } if err := models.CreateUser(u); err != nil { - switch err { - case models.ErrUserAlreadyExist: + switch { + case models.IsErrUserAlreadyExist(err): ctx.Data["Err_UserName"] = true ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), USER_NEW, &form) - case models.ErrEmailAlreadyUsed: + case models.IsErrEmailAlreadyUsed(err): ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_been_used"), USER_NEW, &form) - case models.ErrUserNameIllegal: + case models.IsErrNameReserved(err): + ctx.Data["Err_UserName"] = true + ctx.RenderWithErr(ctx.Tr("user.form.name_reserved", err.(models.ErrNameReserved).Name), USER_NEW, &form) + case models.IsErrNamePatternNotAllowed(err): ctx.Data["Err_UserName"] = true - ctx.RenderWithErr(ctx.Tr("form.illegal_username"), USER_NEW, &form) + ctx.RenderWithErr(ctx.Tr("user.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), USER_NEW, &form) default: ctx.Handle(500, "CreateUser", err) } @@ -195,7 +198,7 @@ func EditUserPost(ctx *middleware.Context, form auth.AdminEditUserForm) { u.AllowGitHook = form.AllowGitHook if err := models.UpdateUser(u); err != nil { - if err == models.ErrEmailAlreadyUsed { + if models.IsErrEmailAlreadyUsed(err) { ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_been_used"), USER_EDIT, &form) } else { |