From 679860400f1c6c542b33e8c80221cc5aca7b5629 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Mon, 30 Sep 2013 17:15:07 -0400 Subject: Move set_inverse_instance to association.build_record [fixes #10371] --- activerecord/lib/active_record/associations/association.rb | 1 + activerecord/lib/active_record/associations/collection_association.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb index 99f307922e..1e324c7e95 100644 --- a/activerecord/lib/active_record/associations/association.rb +++ b/activerecord/lib/active_record/associations/association.rb @@ -240,6 +240,7 @@ module ActiveRecord skip_assign = [reflection.foreign_key, reflection.type].compact attributes = create_scope.except(*(record.changed - skip_assign)) record.assign_attributes(attributes, :without_protection => true) + set_inverse_instance(record) end end end diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index baddb9852f..c2dd462b5d 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -350,7 +350,6 @@ module ActiveRecord end callback(:after_add, record) - set_inverse_instance(record) record end -- cgit v1.2.3