Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect/Improve error handle in edit user page #23805

Merged
merged 2 commits into from
Mar 30, 2023
Merged

Fix incorrect/Improve error handle in edit user page #23805

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e614b8
fix
yp05327 Mar 30, 2023
b94759f
Merge branch 'main' into improve-error-handle-in-edit-user
jolheiser Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions routers/web/admin/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,13 @@ func EditUserPost(ctx *context.Context) {
log.Error(err.Error())
errMsg = ctx.Tr("auth.password_pwned_err")
}
ctx.RenderWithErr(errMsg, tplUserNew, &form)
ctx.RenderWithErr(errMsg, tplUserEdit, &form)
return
}

if err := user_model.ValidateEmail(form.Email); err != nil {
ctx.Data["Err_Email"] = true
ctx.RenderWithErr(ctx.Tr("form.email_error"), tplUserNew, &form)
ctx.RenderWithErr(ctx.Tr("form.email_error"), tplUserEdit, &form)
return
}

Expand All @@ -338,7 +338,10 @@ func EditUserPost(ctx *context.Context) {

if len(form.UserName) != 0 && u.Name != form.UserName {
if err := user_setting.HandleUsernameChange(ctx, u, form.UserName); err != nil {
ctx.Redirect(setting.AppSubURL + "/admin/users")
if ctx.Written() {
lunny marked this conversation as resolved.
Show resolved Hide resolved
return
}
ctx.RenderWithErr(ctx.Flash.ErrorMsg, tplUserEdit, &form)
return
}
u.Name = form.UserName
Expand Down