From 87d6cb379d8cffd3f12b2dab6248ff3e8f830307 Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Sat, 22 Apr 2017 12:27:25 +0900 Subject: Set to `form_with_generates_remote_forms` only when config is explicitly specified Without this check, even if config is not specified, `ActionView::Helpers::FormHelper.form_with_generates_remote_forms` always be set to nil and remote form not be generated. Follow up to 128b804c6ce40fcbde744f294f8cb98654f6efec --- actionview/lib/action_view/railtie.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'actionview') diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index bc474f453e..61678933e9 100644 --- a/actionview/lib/action_view/railtie.rb +++ b/actionview/lib/action_view/railtie.rb @@ -19,8 +19,10 @@ module ActionView initializer "action_view.form_with_generates_remote_forms" do |app| ActiveSupport.on_load(:action_view) do - ActionView::Helpers::FormHelper.form_with_generates_remote_forms = - app.config.action_view.delete(:form_with_generates_remote_forms) + form_with_generates_remote_forms = app.config.action_view.delete(:form_with_generates_remote_forms) + unless form_with_generates_remote_forms.nil? + ActionView::Helpers::FormHelper.form_with_generates_remote_forms = form_with_generates_remote_forms + end end end -- cgit v1.2.3