diff options
Diffstat (limited to 'routers/user/setting.go')
| -rw-r--r-- | routers/user/setting.go | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/routers/user/setting.go b/routers/user/setting.go index a44d3b7e..20e6c060 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -218,7 +218,7 @@ func SettingsEmailPost(ctx *middleware.Context, form auth.AddEmailForm) { if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { log.Error(4, "Set cache(MailResendLimit) fail: %v", err) } - ctx.Flash.Success(ctx.Tr("settings.add_email_success_confirmation_email_sent")) + ctx.Flash.Info(ctx.Tr("settings.add_email_confirmation_sent", cleanEmail, setting.Service.ActiveCodeLives/60)) } else { ctx.Flash.Success(ctx.Tr("settings.add_email_success")) } @@ -451,20 +451,13 @@ func SettingsDelete(ctx *middleware.Context) { ctx.Data["PageIsSettingsDelete"] = true if ctx.Req.Method == "POST" { - // tmpUser := models.User{ - // Passwd: ctx.Query("password"), - // Salt: ctx.User.Salt, - // } - // tmpUser.EncodePasswd() - // if tmpUser.Passwd != ctx.User.Passwd { - // ctx.Flash.Error("Password is not correct. Make sure you are owner of this account.") - // } else { + // FIXME: validate password. if err := models.DeleteUser(ctx.User); err != nil { - switch err { - case models.ErrUserOwnRepos: + switch { + case models.IsErrUserOwnRepos(err): ctx.Flash.Error(ctx.Tr("form.still_own_repo")) ctx.Redirect(setting.AppSubUrl + "/user/settings/delete") - case models.ErrUserHasOrgs: + case models.IsErrUserHasOrgs(err): ctx.Flash.Error(ctx.Tr("form.still_has_org")) ctx.Redirect(setting.AppSubUrl + "/user/settings/delete") default: |