Limits nested set overhead when destroying an issue without children.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5286 e93f8b46-1217-0410-a6f0-8f06a7374b81

Limits nested set overhead when destroying an issue without children.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5286 e93f8b46-1217-0410-a6f0-8f06a7374b81
e6659501 · Jean-Philippe Lang · Eric Davis · cfbe69ab · e6659501
Commit e6659501 authored Apr 01, 2011 by Jean-Philippe Lang Committed by Eric Davis Apr 16, 2011
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

awesome_nested_set.rb vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb +2 -1

No files found.
--- a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
+++ b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
@@ -444,11 +444,12 @@ module CollectiveIdea #:nodoc:
        # Prunes a branch off of the tree, shifting all of the elements on the right
        # back to the left so the counts still work.
        def prune_from_tree
-          return if right.nil? || left.nil? || !self.class.exists?(id)
+          return if right.nil? || left.nil? || leaf? || !self.class.exists?(id)

          delete_method = acts_as_nested_set_options[:dependent] == :destroy ?
            :destroy_all : :delete_all

+          # TODO: should destroy children (not descendants) when deleted_method is :destroy_all
          self.class.base_class.transaction do
            reload_nested_set
            nested_set_scope.send(delete_method,