diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-12-18 11:44:54 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-12-18 11:44:54 +0100 |
| commit | d4f315f3044f69dfe64fbfd2348fcaa5deb2aa5e (patch) | |
| tree | e3684038c30aef2dd3a0c9b5ec76de83e043663c /app/views | |
| parent | 7efef7db9ed6f7b25a28166c1b75a28adbaf7cdb (diff) | |
| parent | 76761d5fc0886e44a7a6eb94ab62aae8204d9e6e (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/instances/show.html.haml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index 2b6e28e8d..64cfc9a77 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -71,7 +71,9 @@ = t('admin.accounts.no_limits_imposed') .dashboard__counters__label= t 'admin.accounts.login_status' -- unless @account.local? && @account.user.nil? +- if @account.local? && @account.user.nil? + = link_to t('admin.accounts.unblock_email'), unblock_email_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unblock_email, @account) && CanonicalEmailBlock.where(reference_account_id: @account.id).exists? +- else .table-wrapper %table.table.inline-table %tbody diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml index d6542ac3e..e520bca0c 100644 --- a/app/views/admin/instances/show.html.haml +++ b/app/views/admin/instances/show.html.haml @@ -84,3 +84,5 @@ = link_to t('admin.instances.delivery.stop'), stop_delivery_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post }, class: 'button' - else = link_to t('admin.instances.delivery.restart'), restart_delivery_admin_instance_path(@instance), data: { confirm: t('admin.accounts.are_you_sure'), method: :post }, class: 'button' + - unless @instance.delivery_failure_tracker.available? && @instance.accounts_count > 0 + = link_to t('admin.instances.purge'), admin_instance_path(@instance), data: { confirm: t('admin.instances.confirm_purge'), method: :delete }, class: 'button' |