diff options
author | Tristan Dunn <tristanzdunn@gmail.com> | 2009-08-09 19:37:12 -0400 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-08-10 00:46:16 +0100 |
commit | a0f69722be00cd546558b067054e9e7ae2564274 (patch) | |
tree | 69be303f260134359b61215fdc83e9fedafdcc3b /activerecord/lib/active_record/associations | |
parent | 0472839d684d836e1e7ecd39722c313410d76d5b (diff) | |
download | rails-a0f69722be00cd546558b067054e9e7ae2564274.tar.gz rails-a0f69722be00cd546558b067054e9e7ae2564274.tar.bz2 rails-a0f69722be00cd546558b067054e9e7ae2564274.zip |
Allow ho:through#build when the owner is a new record [#1749 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r-- | activerecord/lib/active_record/associations/has_one_through_association.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_through_association.rb b/activerecord/lib/active_record/associations/has_one_through_association.rb index 830aa1808a..a79bf943d1 100644 --- a/activerecord/lib/active_record/associations/has_one_through_association.rb +++ b/activerecord/lib/active_record/associations/has_one_through_association.rb @@ -18,9 +18,15 @@ module ActiveRecord current_object = @owner.send(@reflection.through_reflection.name) if current_object - new_value ? current_object.update_attributes(construct_join_attributes(new_value)) : current_object.destroy - else - @owner.send(@reflection.through_reflection.name, klass.send(:create, construct_join_attributes(new_value))) if new_value + new_value ? current_object.update_attributes(construct_join_attributes(new_value)) : current_object.destroy + elsif new_value + if @owner.new_record? + self.target = new_value + through_association = @owner.send(:association_instance_get, @reflection.through_reflection.name) + through_association.build(construct_join_attributes(new_value)) + else + @owner.send(@reflection.through_reflection.name, klass.create(construct_join_attributes(new_value))) + end end end |