From db2930a46fa9da38c4b5af8f7c88f5e96ddf2a9d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Sun, 20 Jul 2025 12:13:02 -0400
Subject: [PATCH] Use before action to set up i-var in create action

---
 app/controllers/admin/domain_blocks_controller.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 60c976d2fcf..c9d7a18f295 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -3,8 +3,8 @@
 module Admin
   class DomainBlocksController < BaseController
     before_action :set_domain_block, only: [:destroy, :edit, :update]
-
     before_action :authorize_domain_block_create, only: [:batch, :new, :create]
+    before_action :populate_domain_block_from_params, only: :create
 
     PERMITTED_PARAMS = %i(
       domain
@@ -40,8 +40,6 @@ module Admin
     end
 
     def create
-      @domain_block = DomainBlock.new(resource_params)
-
       # Disallow accidentally downgrading a domain block
       if existing_domain_block.present? && !@domain_block.stricter_than?(existing_domain_block)
         @domain_block.validate
@@ -98,6 +96,10 @@ module Admin
       authorize :domain_block, :create?
     end
 
+    def populate_domain_block_from_params
+      @domain_block = DomainBlock.new(resource_params)
+    end
+
     def existing_domain_block
       @existing_domain_block ||= DomainBlock.rule_for(resource_params[:domain]) if resource_params[:domain].present?
     end