diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-03-12 22:35:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 22:35:20 +0100 |
| commit | bea0bb39d6c1762c97da484ffa8b5d73341e67e2 (patch) | |
| tree | 0da0cf236231fde4b6103e4dc2428a99c1669e05 /app/views/admin/email_domain_blocks | |
| parent | f556f79b7733834430b93109ac2c7f87529c8574 (diff) | |
Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)
* Add shortcuts to blacklist a user's e-mail domain in admin UI * Add option to blacklist resolved MX and IP records for e-mail domains
Diffstat (limited to 'app/views/admin/email_domain_blocks')
| -rw-r--r-- | app/views/admin/email_domain_blocks/_email_domain_block.html.haml | 10 | ||||
| -rw-r--r-- | app/views/admin/email_domain_blocks/new.html.haml | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml index bf66c9001..41ab8c171 100644 --- a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml +++ b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml @@ -3,3 +3,13 @@ %samp= email_domain_block.domain %td = table_link_to 'trash', t('admin.email_domain_blocks.delete'), admin_email_domain_block_path(email_domain_block), method: :delete + +- email_domain_block.children.each do |child_email_domain_block| + %tr + %td + %samp= child_email_domain_block.domain + %span.muted-hint + = surround '(', ')' do + = t('admin.email_domain_blocks.from_html', domain: content_tag(:samp, email_domain_block.domain)) + %td + = table_link_to 'trash', t('admin.email_domain_blocks.delete'), admin_email_domain_block_path(child_email_domain_block), method: :delete diff --git a/app/views/admin/email_domain_blocks/new.html.haml b/app/views/admin/email_domain_blocks/new.html.haml index f372fa512..4a346f240 100644 --- a/app/views/admin/email_domain_blocks/new.html.haml +++ b/app/views/admin/email_domain_blocks/new.html.haml @@ -5,7 +5,10 @@ = render 'shared/error_messages', object: @email_domain_block .fields-group - = f.input :domain, wrapper: :with_label, label: t('admin.email_domain_blocks.domain') + = f.input :domain, wrapper: :with_block_label, label: t('admin.email_domain_blocks.domain') + + .fields-group + = f.input :with_dns_records, as: :boolean, wrapper: :with_label .actions = f.button :button, t('.create'), type: :submit |