Merged r11692 from trunk (#13586).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11697 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-04-03 17:04:40 +00:00
parent e189641e8c
commit ca39b05420
2 changed files with 19 additions and 2 deletions
@@ -859,10 +859,14 @@ class Issue < ActiveRecord::Base
    dependencies = []
    dependencies += relations_from.map(&:issue_to)
    dependencies += children unless leaf?
-    dependencies << parent
    dependencies.compact!
    dependencies -= except
-    dependencies + dependencies.map {|issue| issue.all_dependent_issues(except)}.flatten
+    dependencies += dependencies.map {|issue| issue.all_dependent_issues(except)}.flatten
+    if parent
+      dependencies << parent
+      dependencies += parent.all_dependent_issues(except + parent.descendants)
+    end
+    dependencies
  end

  # Returns an array of issues that duplicate this one