Skip to content

Commit b93ee76

Browse files
ClearlyClairehiyuki2578
authored andcommitted
Fix admin interface showing superfluous reject media/reports on suspended blocks (mastodon#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
1 parent 227ef92 commit b93ee76

2 files changed

Lines changed: 19 additions & 10 deletions

File tree

app/javascript/packs/admin.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { delegate } from 'rails-ujs';
2+
import ready from '../mastodon/ready';
23

34
const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
45

@@ -29,7 +30,7 @@ delegate(document, '.media-spoiler-hide-button', 'click', () => {
2930
});
3031
});
3132

32-
delegate(document, '#domain_block_severity', 'change', ({ target }) => {
33+
const onDomainBlockSeverityChange = (target) => {
3334
const rejectMediaDiv = document.querySelector('.input.with_label.domain_block_reject_media');
3435
const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports');
3536

@@ -40,4 +41,11 @@ delegate(document, '#domain_block_severity', 'change', ({ target }) => {
4041
if (rejectReportsDiv) {
4142
rejectReportsDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
4243
}
44+
};
45+
46+
delegate(document, '#domain_block_severity', 'change', ({ target }) => onDomainBlockSeverityChange(target));
47+
48+
ready(() => {
49+
const input = document.getElementById('domain_block_severity');
50+
if (input) onDomainBlockSeverityChange(input);
4351
});

app/views/admin/instances/index.html.haml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,16 @@
4444
- if !instance.domain_block.noop?
4545
= t("admin.domain_blocks.severity.#{instance.domain_block.severity}")
4646
- first_item = false
47-
- if instance.domain_block.reject_media?
48-
- unless first_item
49-
•
50-
= t('admin.domain_blocks.rejecting_media')
51-
- first_item = false
52-
- if instance.domain_block.reject_reports?
53-
- unless first_item
54-
•
55-
= t('admin.domain_blocks.rejecting_reports')
47+
- unless instance.domain_block.suspend?
48+
- if instance.domain_block.reject_media?
49+
- unless first_item
50+
•
51+
= t('admin.domain_blocks.rejecting_media')
52+
- first_item = false
53+
- if instance.domain_block.reject_reports?
54+
- unless first_item
55+
•
56+
= t('admin.domain_blocks.rejecting_reports')
5657
- elsif whitelist_mode?
5758
= t('admin.accounts.whitelisted')
5859
- else

0 commit comments

Comments
 (0)