diff options
author | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
commit | 3fa90982efda2109ddf90d81f5ed3449f8282642 (patch) | |
tree | e5514f4c72c9ffb44059a2afb7fdf24d0348bbd4 /app/controllers/admin/domain_blocks_controller.rb | |
parent | 714940de498e93a8bf40dcda1835217df18741bf (diff) | |
parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/admin/domain_blocks_controller.rb')
-rw-r--r-- | app/controllers/admin/domain_blocks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb index 71597763b..377cac8ad 100644 --- a/app/controllers/admin/domain_blocks_controller.rb +++ b/app/controllers/admin/domain_blocks_controller.rb @@ -13,7 +13,7 @@ module Admin authorize :domain_block, :create? @domain_block = DomainBlock.new(resource_params) - existing_domain_block = resource_params[:domain].present? ? DomainBlock.find_by(domain: resource_params[:domain]) : nil + existing_domain_block = resource_params[:domain].present? ? DomainBlock.rule_for(resource_params[:domain]) : nil if existing_domain_block.present? && !@domain_block.stricter_than?(existing_domain_block) @domain_block.save |