hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
signup-info-prompt
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/packs/admin.js
View File

@ -1,4 +1,5 @@
import { delegate } from 'rails-ujs'; import { delegate } from 'rails-ujs';
import ready from '../mastodon/ready';
const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]'; const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
@ -29,7 +30,7 @@ delegate(document, '.media-spoiler-hide-button', 'click', () => {
}); });
}); });
delegate(document, '#domain_block_severity', 'change', ({ target }) => { const onDomainBlockSeverityChange = (target) => {
const rejectMediaDiv = document.querySelector('.input.with_label.domain_block_reject_media'); const rejectMediaDiv = document.querySelector('.input.with_label.domain_block_reject_media');
const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports'); const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports');
@ -40,4 +41,11 @@ delegate(document, '#domain_block_severity', 'change', ({ target }) => {
if (rejectReportsDiv) { if (rejectReportsDiv) {
rejectReportsDiv.style.display = (target.value === 'suspend') ? 'none' : 'block'; rejectReportsDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
} }
};
delegate(document, '#domain_block_severity', 'change', ({ target }) => onDomainBlockSeverityChange(target));
ready(() => {
const input = document.getElementById('domain_block_severity');
if (input) onDomainBlockSeverityChange(input);
}); });

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

@ -44,15 +44,16 @@
- if !instance.domain_block.noop? - if !instance.domain_block.noop?
= t("admin.domain_blocks.severity.#{instance.domain_block.severity}") = t("admin.domain_blocks.severity.#{instance.domain_block.severity}")
- first_item = false - first_item = false
- if instance.domain_block.reject_media? - unless instance.domain_block.suspend?
- unless first_item - if instance.domain_block.reject_media?
• - unless first_item
= t('admin.domain_blocks.rejecting_media') •
- first_item = false = t('admin.domain_blocks.rejecting_media')
- if instance.domain_block.reject_reports? - first_item = false
- unless first_item - if instance.domain_block.reject_reports?
• - unless first_item
= t('admin.domain_blocks.rejecting_reports') •
= t('admin.domain_blocks.rejecting_reports')
- elsif whitelist_mode? - elsif whitelist_mode?
= t('admin.accounts.whitelisted') = t('admin.accounts.whitelisted')
- else - else