Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix admin interface showing superfluous reject media/reports on suspended blocks (#11749)

Browse source 
* 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
This commit is contained in:
ThibG 2019-09-03 22:53:27 +02:00 • committed by Eugen Rochko
parent 692c5b439a
commit c1e238a77b
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/views/admin/instances/index.html.haml
View file

@ -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