TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
Changes:
- `RenderWithErr` should render `tplUserEdit` not `tplUserNew` in edit
page
- If error occurred in `HandleUsernameChange` redirect to original edit
page instead of user list page
This commit is contained in:
yp05327 2023-03-31 02:27:00 +09:00 committed by GitHub
parent ffd22697ba
commit 06d9d9e407
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
routers/web/admin/users.go
View file

@ -316,13 +316,13 @@ func EditUserPost(ctx *context.Context) {
log.Error(err.Error()) log.Error(err.Error())
errMsg = ctx.Tr("auth.password_pwned_err") errMsg = ctx.Tr("auth.password_pwned_err")
} }
ctx.RenderWithErr(errMsg, tplUserNew, &form) ctx.RenderWithErr(errMsg, tplUserEdit, &form)
return return
} }
if err := user_model.ValidateEmail(form.Email); err != nil { if err := user_model.ValidateEmail(form.Email); err != nil {
ctx.Data["Err_Email"] = true ctx.Data["Err_Email"] = true
ctx.RenderWithErr(ctx.Tr("form.email_error"), tplUserNew, &form) ctx.RenderWithErr(ctx.Tr("form.email_error"), tplUserEdit, &form)
return return
} }
@ -338,7 +338,10 @@ func EditUserPost(ctx *context.Context) {
if len(form.UserName) != 0 && u.Name != form.UserName { if len(form.UserName) != 0 && u.Name != form.UserName {
if err := user_setting.HandleUsernameChange(ctx, u, form.UserName); err != nil { if err := user_setting.HandleUsernameChange(ctx, u, form.UserName); err != nil {
ctx.Redirect(setting.AppSubURL + "/admin/users") if ctx.Written() {
return
}
ctx.RenderWithErr(ctx.Flash.ErrorMsg, tplUserEdit, &form)
return return
} }
u.Name = form.UserName u.Name = form.UserName