diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-07-20 01:22:24 +0900 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-07-20 01:22:24 +0900 |
commit | b00cac4adc0413418ffd2c59b52c8f64acff406b (patch) | |
tree | 1696371c3ca1376d54310006744c146185f3c30b /actionpack/lib/action_view | |
parent | 13e18dd94000cef2b2058b96d62de16b7d3a2200 (diff) | |
download | rails-b00cac4adc0413418ffd2c59b52c8f64acff406b.tar.gz rails-b00cac4adc0413418ffd2c59b52c8f64acff406b.tar.bz2 rails-b00cac4adc0413418ffd2c59b52c8f64acff406b.zip |
Finish convert_to_object updates
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 56ee43496c..2b39d08035 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -1029,7 +1029,7 @@ module ActionView def fields_for_with_nested_attributes(association_name, args, block) name = "#{object_name}[#{association_name}_attributes]" association = @object.send(association_name) - explicit_object = args.first if args.first.respond_to?(:new_record?) + explicit_object = args.first.to_model if args.first.respond_to?(:to_model) if association.is_a?(Array) children = explicit_object ? [explicit_object] : association @@ -1044,6 +1044,8 @@ module ActionView end def fields_for_nested_model(name, object, args, block) + object = convert_to_model(object) + if object.new_record? @template.fields_for(name, object, *args, &block) else |