about summary refs log tree commit diff
path: root/app/views/admin/domain_blocks/index.html.haml
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-16 12:51:30 +0200
committerGitHub <noreply@github.com>2017-04-16 12:51:30 +0200
commit5d710b1139b34f2ed6bd556f448fa7248354e758 (patch)
tree958a5ff315699f13b4668f190c321291df06e29c /app/views/admin/domain_blocks/index.html.haml
parent8a58942c80275788cbe069f2d67c396732ec092d (diff)
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
Diffstat (limited to 'app/views/admin/domain_blocks/index.html.haml')
-rw-r--r--app/views/admin/domain_blocks/index.html.haml9
1 files changed, 8 insertions, 1 deletions
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'