tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-13 13:08:19 +00:00
Code Releases Activity

Fix user primary email changed (#17840)

Browse Source
This commit is contained in:
Lunny Xiao
2021-11-28 19:04:44 +08:00
committed by GitHub
parent 04517e17d6
commit d29a0fc3be
6 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
routers/web/admin/users.go
View File

@@ -273,6 +273,11 @@ func EditUserPost(ctx *context.Context) {
ctx.RenderWithErr(errMsg, tplUserNew, &form)
return
}
if err := models.ValidateEmail(form.Email); err != nil {
ctx.Data["Err_Email"] = true
ctx.RenderWithErr(ctx.Tr("form.email_error"), tplUserNew, &form)
return
}
if u.Salt, err = models.GetUserSalt(); err != nil {
ctx.ServerError("UpdateUser", err)
return
@@ -307,7 +312,9 @@ func EditUserPost(ctx *context.Context) {
u.LoginName = form.LoginName
u.FullName = form.FullName
u.Email = form.Email
email := strings.TrimSpace(form.Email)
emailChanged := !strings.EqualFold(u.Email, email)
u.Email = email
u.Website = form.Website
u.Location = form.Location
u.MaxRepoCreation = form.MaxRepoCreation
@@ -327,7 +334,7 @@ func EditUserPost(ctx *context.Context) {
u.ProhibitLogin = form.ProhibitLogin
}
if err := models.UpdateUser(u); err != nil {
if err := models.UpdateUser(u, emailChanged); err != nil {
if models.IsErrEmailAlreadyUsed(err) {
ctx.Data["Err_Email"] = true
ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplUserEdit, &form)

2
routers/web/org/setting.go
View File

@@ -96,7 +96,7 @@ func SettingsPost(ctx *context.Context) {
visibilityChanged := form.Visibility != org.Visibility
org.Visibility = form.Visibility
if err := models.UpdateUser(org); err != nil {
if err := models.UpdateUser(org, false); err != nil {
ctx.ServerError("UpdateUser", err)
return
}