diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-07 15:03:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-07 15:03:31 +0200 |
| commit | 3f9959a4b66c8d33a1de6dd13972327ff62f2cd3 (patch) | |
| tree | 56bef462d8ec527b893e5f02d687d419b5440cc9 /app/views/admin | |
| parent | 00c9363f07081e0149533023992fba47dd905384 (diff) | |
| parent | e2f4bafc136cb0853321ed4be1b02106bec8bc93 (diff) | |
Merge pull request #1734 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 1230294fe..a69832b04 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -128,17 +128,11 @@ %td{ rowspan: can?(:reset_password, @account.user) ? 2 : 1 } - if @account.user&.two_factor_enabled? = t 'admin.accounts.security_measures.password_and_2fa' - - elsif @account.user&.skip_sign_in_token? - = t 'admin.accounts.security_measures.only_password' - else - = t 'admin.accounts.security_measures.password_and_sign_in_token' + = t 'admin.accounts.security_measures.only_password' %td - if @account.user&.two_factor_enabled? = table_link_to 'unlock', t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete if can?(:disable_2fa, @account.user) - - elsif @account.user&.skip_sign_in_token? - = table_link_to 'lock', t('admin.accounts.enable_sign_in_token_auth'), admin_user_sign_in_token_authentication_path(@account.user.id), method: :post if can?(:enable_sign_in_token_auth, @account.user) - - else - = table_link_to 'unlock', t('admin.accounts.disable_sign_in_token_auth'), admin_user_sign_in_token_authentication_path(@account.user.id), method: :delete if can?(:disable_sign_in_token_auth, @account.user) - if can?(:reset_password, @account.user) %tr |