From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 21 Jan 2014 06:51:22 +0000 (+0000)
Subject: graft r5285 to awesome_nested_set 2.1.5 (#7920)
X-Git-Tag: 2.5.0~214
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2d2542008e94d0f47b3b22347c28a6a8bcbabee9;p=redmine.git

graft r5285 to awesome_nested_set 2.1.5 (#7920)

git-svn-id: http://svn.redmine.org/redmine/trunk@12685 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb
index b101a5ef2..797ce2ab5 100644
--- a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb
+++ b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb
@@ -590,6 +590,8 @@ module CollectiveIdea #:nodoc:
               ["#{quoted_right_column_name} = (#{quoted_right_column_name} - ?)", diff]
             )
 
+            # Reload is needed because children may have updated their parent (self) during deletion.
+            reload
             # Don't allow multiple calls to destroy to corrupt the set
             self.skip_before_destroy = true
           end