diff options
| author | sdukhovni <dukhovni@mit.edu> | 2017-07-24 22:26:55 +1000 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-24 14:26:55 +0200 |
| commit | 06d905f415f38ed8e13f6390a93a0db928dee6a7 (patch) | |
| tree | c2a3ff6b6d0ebc34c7c38e5dc35e312d294ec1af /app/views/admin/domain_blocks | |
| parent | 0ad41be0f314a9ee16cd167620e0636859349cc8 (diff) | |
Allow domain blocks that only reject media without silencing or suspending (#4325)
* 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
Diffstat (limited to 'app/views/admin/domain_blocks')
| -rw-r--r-- | app/views/admin/domain_blocks/show.html.haml | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/app/views/admin/domain_blocks/show.html.haml b/app/views/admin/domain_blocks/show.html.haml index 70dfef9b2..ea1929d44 100644 --- a/app/views/admin/domain_blocks/show.html.haml +++ b/app/views/admin/domain_blocks/show.html.haml @@ -3,13 +3,18 @@ = simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :delete do |f| - = f.input :retroactive, - as: :boolean, - wrapper: :with_label, - label: t(".retroactive.#{@domain_block.severity}"), - hint: t(:affected_accounts, - scope: [:admin, :domain_blocks, :show], - count: @domain_block.accounts_count) + - if (@domain_block.noop?) + = f.input :retroactive, + as: :hidden, + input_html: { :value => "0" } + - else + = f.input :retroactive, + as: :boolean, + wrapper: :with_label, + label: t(".retroactive.#{@domain_block.severity}"), + hint: t(:affected_accounts, + scope: [:admin, :domain_blocks, :show], + count: @domain_block.accounts_count) .actions = f.button :button, t('.undo'), type: :submit |