diff --git a/app/views/settings/_security.haml b/app/views/settings/_security.haml index bc673ba7..8d7f1f67 100644 --- a/app/views/settings/_security.haml +++ b/app/views/settings/_security.haml @@ -4,4 +4,4 @@ - if current_user.otp_module_disabled? = render partial: 'settings/security/totp_setup', locals: { qr_svg: qr_svg } - else - = render partial: 'settings/security/totp_enabled' + = render partial: 'settings/security/totp_enabled', locals: { recovery_code_count: recovery_code_count } diff --git a/app/views/settings/security/_totp_enabled.haml b/app/views/settings/security/_totp_enabled.haml index ac45ab59..5e15f872 100644 --- a/app/views/settings/security/_totp_enabled.haml +++ b/app/views/settings/security/_totp_enabled.haml @@ -1,6 +1,6 @@ %p Your account is set up to require the use of a one-time password in order to log in. -%p You currently have #{@recovery_code_count} unused recovery codes. +%p You currently have #{recovery_code_count} unused recovery codes. = link_to t('views.actions.remove'), destroy_user_2fa_path, class: 'btn btn-danger', method: 'delete', data: { confirm: t('views.settings.security.2fa.detach_confirm') } -= link_to "Re-generate recovery codes", reset_user_recovery_codes_path, class: 'btn btn-primary', method: 'delete', - data: { confirm: "Are you sure? This will disable your previous set of recovery codes." } \ No newline at end of file += link_to 'Re-generate recovery codes', reset_user_recovery_codes_path, class: 'btn btn-primary', method: 'delete', + data: { confirm: 'Are you sure? This will disable your previous set of recovery codes.' } diff --git a/app/views/user/edit_security.haml b/app/views/user/edit_security.haml index bcdebbea..e68d2636 100644 --- a/app/views/user/edit_security.haml +++ b/app/views/user/edit_security.haml @@ -1,4 +1,4 @@ -= render 'settings/security', qr_svg: @qr_svg += render 'settings/security', qr_svg: @qr_svg, recovery_code_count: @recovery_code_count - provide(:title, generate_title('Security Settings')) - parent_layout 'user/settings'