diff options
author | Jon Leighton <j@jonathanleighton.com> | 2010-12-23 19:53:52 +0000 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2010-12-26 18:46:58 +0000 |
commit | 3eef0977e15d74518673e0bb3a9305cb41682dac (patch) | |
tree | 807390526417474284d908cc8d028662099e9429 /activerecord/lib/active_record/associations/has_one_through_association.rb | |
parent | b5c30f9dacd73715830bbe53a45e98a7d2007d19 (diff) | |
download | rails-3eef0977e15d74518673e0bb3a9305cb41682dac.tar.gz rails-3eef0977e15d74518673e0bb3a9305cb41682dac.tar.bz2 rails-3eef0977e15d74518673e0bb3a9305cb41682dac.zip |
Use the through association proxy for operations on the through record, so that those operations are automatically scoped and therefore construct_join_attributes does not need to use construct_owner_attributes.
Diffstat (limited to 'activerecord/lib/active_record/associations/has_one_through_association.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/has_one_through_association.rb | 24 |
1 files changed, 13 insertions, 11 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 eb17935d6a..2558941476 100644 --- a/activerecord/lib/active_record/associations/has_one_through_association.rb +++ b/activerecord/lib/active_record/associations/has_one_through_association.rb @@ -13,20 +13,22 @@ module ActiveRecord private - def create_through_record(new_value) #nodoc: - klass = @reflection.through_reflection.klass + def create_through_record(new_value) + proxy = @owner.send(@reflection.through_reflection.name) || + @owner.send(:association_instance_get, @reflection.through_reflection.name) + record = proxy.target - 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 + if record && !new_value + record.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)) + attributes = construct_join_attributes(new_value) + + if record + record.update_attributes(attributes) + elsif @owner.new_record? + proxy.build(attributes) else - @owner.send(@reflection.through_reflection.name, klass.create(construct_join_attributes(new_value))) + proxy.create(attributes) end end end |