aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-01-02 11:19:42 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2013-01-02 11:19:42 -0800
commit497c4bbd474fce78bed9289a1788c09fbf9b514a (patch)
tree034aea7949b68d12676c5ffc04debc579fd11cae /actionpack/lib/action_view/helpers
parentb9340348204b5de0d53965f7666576d5c772e16c (diff)
downloadrails-497c4bbd474fce78bed9289a1788c09fbf9b514a.tar.gz
rails-497c4bbd474fce78bed9289a1788c09fbf9b514a.tar.bz2
rails-497c4bbd474fce78bed9289a1788c09fbf9b514a.zip
ask the form builder for form tag attributes
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb5
1 files changed, 3 insertions, 2 deletions
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(/\[\]$/)