jro_apps/redmine Commit - r4615:419b195019a2

Fixed: subtasks are deleted (not destroyed) when destroying parent issue (#7385)....

Jean-Philippe Lang -

r4615:419b195019a2

parent child

Context file:

r4615:419b195019a2

Collapse all files

app/models/issue.rb +1 -10

                has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
                has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
-               acts_as_nested_set :scope => 'root_id'
+               acts_as_nested_set :scope => 'root_id', :dependent => :destroy
                acts_as_attachable :after_remove => :attachment_removed
                acts_as_customizable
                acts_as_watchable
                before_create :default_assign
                before_save :close_duplicates, :update_done_ratio_from_issue_status
                after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes, :create_journal
-               after_destroy :destroy_children
                after_destroy :update_parent_attributes
                # Returns true if usr or current user is allowed to view the issue
                  end
                end
-               def destroy_children
-                 unless leaf?
-                   children.each do |child|
-                     child.destroy
-                   end
-                 end
-               end
                # Update issues so their versions are not pointing to a
                # fixed_version that is not shared with the issue's project
                def self.update_versions(conditions=nil)

test/unit/issue_nested_set_test.rb +33 -1

                  issue2 = create_issue!
                  issue3 = create_issue!(:parent_issue_id => issue2.id)
                  issue4 = create_issue!(:parent_issue_id => issue1.id)
-                 issue2.reload.destroy
+                 issue3.init_journal(User.find(2))
+                 issue3.subject = 'child with journal'
+                 issue3.save!
+                 assert_difference 'Issue.count', -2 do
+                   assert_difference 'Journal.count', -1 do
+                     assert_difference 'JournalDetail.count', -1 do
+                       Issue.find(issue2.id).destroy
+                     end
+                   end
+                 end
                  issue1.reload
                  issue4.reload
                  assert !Issue.exists?(issue2.id)
                  assert_equal [issue1.id, 2, 3], [issue4.root_id, issue4.lft, issue4.rgt]
                end
+               def test_destroy_child_issue_with_children
+                 root = Issue.create!(:project_id => 1, :author_id => 2, :tracker_id => 1, :subject => 'root')
+                 child = Issue.create!(:project_id => 1, :author_id => 2, :tracker_id => 1, :subject => 'child', :parent_issue_id => root.id)
+                 leaf = Issue.create!(:project_id => 1, :author_id => 2, :tracker_id => 1, :subject => 'leaf', :parent_issue_id => child.id)
+                 leaf.init_journal(User.find(2))
+                 leaf.subject = 'leaf with journal'
+                 leaf.save!
+                 assert_difference 'Issue.count', -2 do
+                   assert_difference 'Journal.count', -1 do
+                     assert_difference 'JournalDetail.count', -1 do
+                       Issue.find(child.id).destroy
+                     end
+                   end
+                 end
+                 root = Issue.find(root.id)
+                 assert root.leaf?, "Root issue is not a leaf (lft: #{root.lft}, rgt: #{root.rgt})"
+               end
                def test_parent_priority_should_be_the_highest_child_priority
                  parent = create_issue!(:priority => IssuePriority.find_by_name('Normal'))
                  # Create children

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

                      # 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?
-                       diff = right - left + 1
+                       return if right.nil? || left.nil? || !self.class.exists?(id)
                        delete_method = acts_as_nested_set_options[:dependent] == :destroy ?
                          :destroy_all : :delete_all
                        self.class.base_class.transaction do
+                         reload_nested_set
                          nested_set_scope.send(delete_method,
                            ["#{quoted_left_column_name} > ? AND #{quoted_right_column_name} < ?",
                              left, right]
                          )
+                         reload_nested_set
+                         diff = right - left + 1
                          nested_set_scope.update_all(
                            ["#{quoted_left_column_name} = (#{quoted_left_column_name} - ?)", diff],
                            ["#{quoted_left_column_name} >= ?", right]

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages