Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't remove scheduled destroys when loading an association.

Signed-off-by: José Valim <jose.valim@gmail.com>
  • Loading branch information...
commit 526f1e5f152e1568d3369a606fc1cdaecee894f8 1 parent f8f4872
@chewi chewi authored josevalim committed
View
7 activerecord/lib/active_record/associations/association_collection.rb
@@ -352,7 +352,12 @@ def load_target
@target = find_target.map do |f|
i = @target.index(f)
t = @target.delete_at(i) if i
- (t && t.changed?) ? t : f
+ if t && t.changed?
+ t
+ else
+ f.mark_for_destruction if t && t.marked_for_destruction?
+ f
+ end
end + @target
else
@target = find_target
View
6 activerecord/test/cases/nested_attributes_test.rb
@@ -488,6 +488,12 @@ def test_should_refresh_saved_records_when_not_overwriting_unsaved_updates
assert_equal 'Polly', @pirate.send(@association_name).send(:load_target).last.name
end
+ def test_should_not_remove_scheduled_destroys_when_loading_association
+ @pirate.reload
+ @pirate.send(association_setter, [{ :id => @child_1.id, :_destroy => '1' }])
+ assert @pirate.send(@association_name).send(:load_target).find { |r| r.id == @child_1.id }.marked_for_destruction?
+ end
+
def test_should_take_a_hash_with_composite_id_keys_and_assign_the_attributes_to_the_associated_models
@child_1.stubs(:id).returns('ABC1X')
@child_2.stubs(:id).returns('ABC2X')
Please sign in to comment.
Something went wrong with that request. Please try again.