summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/unit/issue_nested_set_test.rb14
-rw-r--r--vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb2
2 files changed, 15 insertions, 1 deletions
diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb
index d7be36344..8d98ccf06 100644
--- a/test/unit/issue_nested_set_test.rb
+++ b/test/unit/issue_nested_set_test.rb
@@ -223,6 +223,20 @@ class IssueNestedSetTest < ActiveSupport::TestCase
assert_equal [issue1.id, 1, 4], [issue1.root_id, issue1.lft, issue1.rgt]
assert_equal [issue1.id, 2, 3], [issue4.root_id, issue4.lft, issue4.rgt]
end
+
+ def test_destroy_child_should_update_parent
+ issue = create_issue!
+ child1 = create_issue!(:parent_issue_id => issue.id)
+ child2 = create_issue!(:parent_issue_id => issue.id)
+
+ issue.reload
+ assert_equal [issue.id, 1, 6], [issue.root_id, issue.lft, issue.rgt]
+
+ child2.reload.destroy
+
+ issue.reload
+ assert_equal [issue.id, 1, 4], [issue.root_id, issue.lft, issue.rgt]
+ end
def test_destroy_parent_issue_updated_during_children_destroy
parent = create_issue!
diff --git a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
index fcf00b3c3..e50e2a671 100644
--- a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
+++ b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
@@ -444,7 +444,7 @@ 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? || leaf? || !self.class.exists?(id)
+ return if right.nil? || left.nil? || !self.class.exists?(id)
self.class.base_class.transaction do
reload_nested_set