diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-03 22:53:27 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-03 22:53:27 +0200 |
| commit | c1e238a77b1f92a031fcb644c2d37809b96e9027 (patch) | |
| tree | bbc26cad6cfb852450258b5202916e468b79a8f7 /app/views/admin/instances/index.html.haml | |
| parent | 692c5b439ae8659e459da692cf9e6b8e6f29d2a1 (diff) | |
Fix admin interface showing superfluous reject media/reports on suspended blocks (#11749)
* Fix admin interface showing superfluous reject media/reports on suspended domains * Fix reject media/reports checkboxes being visible when editing domain block of suspend severity
Diffstat (limited to 'app/views/admin/instances/index.html.haml')
| -rw-r--r-- | app/views/admin/instances/index.html.haml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml index 982dc5035..1d85aa75e 100644 --- a/app/views/admin/instances/index.html.haml +++ b/app/views/admin/instances/index.html.haml @@ -44,15 +44,16 @@ - if !instance.domain_block.noop? = t("admin.domain_blocks.severity.#{instance.domain_block.severity}") - first_item = false - - if instance.domain_block.reject_media? - - unless first_item - • - = t('admin.domain_blocks.rejecting_media') - - first_item = false - - if instance.domain_block.reject_reports? - - unless first_item - • - = t('admin.domain_blocks.rejecting_reports') + - unless instance.domain_block.suspend? + - if instance.domain_block.reject_media? + - unless first_item + • + = t('admin.domain_blocks.rejecting_media') + - first_item = false + - if instance.domain_block.reject_reports? + - unless first_item + • + = t('admin.domain_blocks.rejecting_reports') - elsif whitelist_mode? = t('admin.accounts.whitelisted') - else |