summaryrefslogtreecommitdiffstats
path: root/lib/plugins
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-01-21 06:51:22 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-01-21 06:51:22 +0000
commit2d2542008e94d0f47b3b22347c28a6a8bcbabee9 (patch)
treeee83a553dd69c74642ccad9aaabdf175119c06a8 /lib/plugins
parent65d2df44db2b7f42178850cc36bd5465f90a7832 (diff)
downloadredmine-2d2542008e94d0f47b3b22347c28a6a8bcbabee9.tar.gz
redmine-2d2542008e94d0f47b3b22347c28a6a8bcbabee9.zip
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
Diffstat (limited to 'lib/plugins')
-rw-r--r--lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb2
1 files changed, 2 insertions, 0 deletions
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