techhub/mastodon
2
0
Fork 0
Code Activity

Fix inability to locally suspend remotely-suspended accounts in moderation interface (#31899)

Browse Source
This commit is contained in:
Claire
2024-09-13 11:11:10 +02:00
committed by GitHub
parent a2c4f5f5c0
commit ba81e4e019
5 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/admin/reports/_actions.html.haml
View File

@@ -27,7 +27,7 @@
= form.button t('admin.accounts.silence'),
name: :silence,
class: 'button button--destructive',
disabled: report.target_account.silenced? || report.target_account.suspended?,
disabled: report.target_account.silenced? || report.target_account.suspended_locally?,
title: report.target_account.silenced? ? t('admin.account_actions.already_silenced') : ''
.report-actions__item__description
= t('admin.reports.actions.silence_description_html')
@@ -36,8 +36,8 @@
= form.button t('admin.accounts.suspend'),
name: :suspend,
class: 'button button--destructive',
disabled: report.target_account.suspended?,
title: report.target_account.suspended? ? t('admin.account_actions.already_suspended') : ''
disabled: report.target_account.suspended_locally?,
title: report.target_account.suspended_locally? ? t('admin.account_actions.already_suspended') : ''
.report-actions__item__description
= t('admin.reports.actions.suspend_description_html')
.report-actions__item