From 497c4bbd474fce78bed9289a1788c09fbf9b514a Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 2 Jan 2013 11:19:42 -0800 Subject: ask the form builder for form tag attributes --- actionpack/lib/action_view/helpers/form_helper.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_view/helpers') diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 800710e888..12227eeb1c 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -436,7 +436,7 @@ module ActionView builder = options[:parent_builder] = instantiate_builder(object_name, object, options) fields_for = fields_for(object_name, object, options, &proc) default_options = builder.multipart? ? { multipart: true } : {} - default_options.merge!(options[:html]) + default_options.merge! builder.form_tag_attributes form_tag(options[:url] || {}, default_options) { fields_for } end @@ -1174,7 +1174,7 @@ module ActionView attr_accessor :object_name, :object, :options - attr_reader :multipart, :parent_builder, :index + attr_reader :multipart, :parent_builder, :index, :form_tag_attributes alias :multipart? :multipart def multipart=(multipart) @@ -1201,6 +1201,7 @@ module ActionView @nested_child_index = {} @object_name, @object, @template, @options = object_name, object, template, options + @form_tag_attributes = options.fetch(:html, {}) @parent_builder = options[:parent_builder] @default_options = @options ? @options.slice(:index, :namespace) : {} if @object_name.to_s.match(/\[\]$/) -- cgit v1.2.3