about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-02-26 17:26:28 +0100
committerGitHub <noreply@github.com>2022-02-26 17:26:28 +0100
commit6aef76b5cde2315135d53215d13a9b2ec0a1adaa (patch)
tree6c2f70986ace8a50650fe768893369976b57a53f
parent3d60708508c6bfc5b6635aff0482d640a5f318ca (diff)
Fix error when a MX is shared across blocked domains (#17650)
-rw-r--r--app/controllers/admin/email_domain_blocks_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb
index 33ee079f3..a4bbbba5b 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -38,6 +38,8 @@ module Admin
           log_action :create, @email_domain_block
 
           (@email_domain_block.other_domains || []).uniq.each do |domain|
+            next if EmailDomainBlock.where(domain: domain).exists?
+
             other_email_domain_block = EmailDomainBlock.create!(domain: domain, parent: @email_domain_block)
             log_action :create, other_email_domain_block
           end