autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow domain blocks that only reject media without silencing or suspending (#4325)

Browse Source 
* Allow domain blocks to reject media without silencing or suspending

* Fix typo

* Hide 'Reject media' button when superfluous, instead of disabling it

* Properly hide 'reject media' checkbox on page load if needed

This may happen when resubmitting the domain block form after an error.

* Don't ask whether undoing a media-only block should be retroactive

* Rename :media_only block to :noop

* Display :noop block as None in frontend, allow blocks that do nothing

* Remove 'coding' line auto-added by emacs
This commit is contained in:
sdukhovni
2017-07-24 22:26:55 +10:00
committed by Eugen Rochko
parent 0ad41be0f3
commit 06d905f415
5 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/domain_block.rb
View File

@ -12,7 +12,7 @@
#
class DomainBlock < ApplicationRecord
enum severity: [:silence, :suspend]
enum severity: [:silence, :suspend, :noop]
attr_accessor :retroactive