From 5d710b1139b34f2ed6bd556f448fa7248354e758 Mon Sep 17 00:00:00 2001 From: Eugen Date: Sun, 16 Apr 2017 12:51:30 +0200 Subject: Make file attachment on MediaAttachment optional (#1865) Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI --- app/views/admin/domain_blocks/index.html.haml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'app/views/admin/domain_blocks/index.html.haml') diff --git a/app/views/admin/domain_blocks/index.html.haml b/app/views/admin/domain_blocks/index.html.haml index 6f4ba9b57..da9a07bbc 100644 --- a/app/views/admin/domain_blocks/index.html.haml +++ b/app/views/admin/domain_blocks/index.html.haml @@ -6,12 +6,19 @@ %tr %th= t('admin.domain_block.domain') %th= t('admin.domain_block.severity') + %th= t('admin.domain_block.reject_media') + %th %tbody - @blocks.each do |block| %tr %td %samp= block.domain - %td= block.severity + %td= t("admin.domain_block.severities.#{block.severity}") + %td + - if block.reject_media? || block.suspend? + %i.fa.fa-check + %td + = table_link_to 'undo', t('admin.domain_block.undo'), admin_domain_block_path(block) = paginate @blocks = link_to t('admin.domain_block.add_new'), new_admin_domain_block_path, class: 'button' -- cgit