diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-15 21:08:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 21:08:39 +0200 |
| commit | c707ef49d9b13932f4d98c127ec3148a5cdc3479 (patch) | |
| tree | 6d282c8b2ee513f2d3f29753bf6c6c0d2c3a227c /app/views/settings/deletes | |
| parent | 1511638975de077b6b8d5397a830239bb317a016 (diff) | |
Fix 2FA challenge and password challenge for non-database users (#11831)
* Fix 2FA challenge not appearing for non-database users Fix #11685 * Fix account deletion not working when using external login Fix #11691
Diffstat (limited to 'app/views/settings/deletes')
| -rw-r--r-- | app/views/settings/deletes/show.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/settings/deletes/show.html.haml b/app/views/settings/deletes/show.html.haml index 6e2ff31c5..08792e0af 100644 --- a/app/views/settings/deletes/show.html.haml +++ b/app/views/settings/deletes/show.html.haml @@ -20,7 +20,10 @@ %hr.spacer/ - = f.input :password, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, hint: t('deletes.confirm_password') + - if current_user.encrypted_password.present? + = f.input :password, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, hint: t('deletes.confirm_password') + - else + = f.input :username, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, hint: t('deletes.confirm_username') .actions = f.button :button, t('deletes.proceed'), type: :submit, class: 'negative' |