diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-17 06:40:38 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-17 06:40:38 -0700 |
| commit | 82d507b4c37ff3a770a0c90424d73e967328094c (patch) | |
| tree | 9545d89c2fab6b8806021cef6e7dc67dda14db7d /activerecord/lib/active_record/associations | |
| parent | 896594f5ae4f11a33be98858b2e359ab1931786c (diff) | |
| parent | 610b63288f05bdec677bfd78c546ee085e5184b9 (diff) | |
| download | rails-82d507b4c37ff3a770a0c90424d73e967328094c.tar.gz rails-82d507b4c37ff3a770a0c90424d73e967328094c.tar.bz2 rails-82d507b4c37ff3a770a0c90424d73e967328094c.zip | |
Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt
Fix collection= on hm:t join models when unsaved
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_through_association.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index 88ff11f953..d8f14c896c 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -37,6 +37,20 @@ module ActiveRecord super end + def concat_records(records) + ensure_not_nested + + records = super + + if owner.new_record? && records + records.flatten.each do |record| + build_through_record(record) + end + end + + records + end + def insert_record(record, validate = true, raise = false) ensure_not_nested |