@ -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 , tplUser New , & form )
ctx . RenderWithErr ( errMsg , tplUser Edit , & 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" ) , tplUser New , & form )
ctx . RenderWithErr ( ctx . Tr ( "form.email_error" ) , tplUser Edit , & 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