diff options
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 | ||||
| -rw-r--r-- | routers/org/setting.go | 9 | ||||
| -rw-r--r-- | templates/org/settings/delete.tmpl | 7 |
3 files changed, 7 insertions, 10 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4c4cc694be..0ee8e7ab0c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -386,6 +386,7 @@ password_uppercase_one = At least one uppercase character password_digit_one = At least one digit password_special_one = At least one special character (punctuation, brackets, quotes, etc.) enterred_invalid_repo_name = The repository name you entered is incorrect. +enterred_invalid_org_name = The organization name you entered is incorrect. enterred_invalid_owner_name = The new owner name is not valid. enterred_invalid_password = The password you entered is incorrect. user_not_exist = The user does not exist. diff --git a/routers/org/setting.go b/routers/org/setting.go index ac12066258..a01b2c862a 100644 --- a/routers/org/setting.go +++ b/routers/org/setting.go @@ -145,12 +145,9 @@ func SettingsDelete(ctx *context.Context) { org := ctx.Org.Organization if ctx.Req.Method == "POST" { - if _, err := models.UserSignIn(ctx.User.Name, ctx.Query("password")); err != nil { - if models.IsErrUserNotExist(err) { - ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_password"), tplSettingsDelete, nil) - } else { - ctx.ServerError("UserSignIn", err) - } + if org.Name != ctx.Query("org_name") { + ctx.Data["Err_OrgName"] = true + ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_org_name"), tplSettingsDelete, nil) return } diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 9743d71cbf..d4911e74b8 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -15,10 +15,9 @@ </div> <form class="ui form ignore-dirty" id="delete-form" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} - <input class="fake" type="password"> - <div class="inline required field {{if .Err_Password}}error{{end}}"> - <label for="password">{{.i18n.Tr "password"}}</label> - <input id="password" name="password" type="password" autocomplete="off" autofocus required> + <div class="inline required field {{if .Err_OrgName}}error{{end}}"> + <label for="org_name">{{.i18n.Tr "org.org_name_holder"}}</label> + <input id="org_name" name="org_name" value="" autocomplete="off" autofocus required> </div> <div class="ui red button delete-button" data-type="form" data-form="#delete-form"> {{.i18n.Tr "org.settings.confirm_delete_account"}} |