From bfdd9f7c295d539a9f8aeb22f965a620ea415224 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 30 Dec 2014 11:24:00 +0000 Subject: The descendant count in the issues delete confirmation message is wrong if issues share some descendants. git-svn-id: http://svn.redmine.org/redmine/trunk@13818 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/issues_helper.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'app') diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 47f972552..44b8e1be4 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -180,20 +180,20 @@ module IssuesHelper s.html_safe end + # Returns the number of descendants for an array of issues + def issues_descendant_count(issues) + ids = issues.reject(&:leaf?).map {|issue| issue.descendants.ids}.flatten.uniq + ids -= issues.map(&:id) + ids.size + end + def issues_destroy_confirmation_message(issues) issues = [issues] unless issues.is_a?(Array) message = l(:text_issues_destroy_confirmation) - descendant_count = issues.inject(0) {|memo, i| memo += (i.right - i.left - 1)/2} + + descendant_count = issues_descendant_count(issues) if descendant_count > 0 - issues.each do |issue| - next if issue.root? - issues.each do |other_issue| - descendant_count -= 1 if issue.is_descendant_of?(other_issue) - end - end - if descendant_count > 0 - message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count) - end + message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count) end message end -- cgit v1.2.3