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
2014-01-21 06:51:22 +00:00 · 2014-01-21 06:51:22 +00:00 · 2d2542008e
parent 65d2df44db
commit 2d2542008e
1 changed files with 2 additions and 0 deletions
--- 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