Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source 
Conflicts:
	app/views/layouts/application.html.haml

Edited:
        app/helpers/application_helper.rb
        app/views/admin/domain_blocks/new.html.haml

Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.

Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
This commit is contained in:
Thibaut Girka 2018-08-26 13:52:12 +02:00
commit 36393e1d2b
97 changed files with 326 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/core/admin.js
View file

@ -41,3 +41,10 @@ delegate(document, '.media-spoiler-hide-button', 'click', () => {
element.click();
});
});
delegate(document, '#domain_block_severity', 'change', ({ target }) => {
const rejectMediaDiv = document.querySelector('.input.with_label.domain_block_reject_media');
if (rejectMediaDiv) {
rejectMediaDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
}
});