diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-15 11:17:25 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-15 15:48:43 -0300 |
| commit | 2ae2728d78298030b1015497840b0519b5ed21a1 (patch) | |
| tree | ceeffeed132ea0b8831ecf4ff29e5741887dc198 /activerecord/lib/active_record | |
| parent | facfc24f256d8367f33a62e3bbea6c0f8c698c1f (diff) | |
| download | rails-2ae2728d78298030b1015497840b0519b5ed21a1.tar.gz rails-2ae2728d78298030b1015497840b0519b5ed21a1.tar.bz2 rails-2ae2728d78298030b1015497840b0519b5ed21a1.zip | |
Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_association
Do not re-save destroyed association on saving parent object
Conflicts:
activerecord/lib/active_record/autosave_association.rb
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/autosave_association.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb index 3fc9d307bc..4da39299f0 100644 --- a/activerecord/lib/active_record/autosave_association.rb +++ b/activerecord/lib/active_record/autosave_association.rb @@ -339,6 +339,8 @@ module ActiveRecord end records.each do |record| + next if record.destroyed? + saved = true if autosave != false && (@new_record_before_save || record.new_record?) |