aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/form_helper.rb
diff options
context:
space:
mode:
authorvirusman <virusman@virusman.ru>2012-12-26 23:53:42 +0400
committervirusman <virusman@virusman.ru>2012-12-27 00:37:35 +0400
commitc009e86fe12cb04e4359ce5ec063364561a6252c (patch)
tree7d698e571bf6448c6f7c92665c90781028849643 /actionpack/lib/action_view/helpers/form_helper.rb
parent899cae25ecd0f5b187cfc1a56c55ed2936885c21 (diff)
downloadrails-c009e86fe12cb04e4359ce5ec063364561a6252c.tar.gz
rails-c009e86fe12cb04e4359ce5ec063364561a6252c.tar.bz2
rails-c009e86fe12cb04e4359ce5ec063364561a6252c.zip
Test nested fields with AssociationProxy mockup & fix AssociationProxy support in form helper
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 516492ca30..7e4f5fa65c 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1802,7 +1802,7 @@ module ActionView
association = convert_to_model(association)
if association.respond_to?(:persisted?)
- association = [association] if @object.send(association_name).is_a?(Array)
+ association = [association] if @object.send(association_name).respond_to?(:to_ary)
elsif !association.respond_to?(:to_ary)
association = @object.send(association_name)
end