Link total spent time to global time entries page when cross_project_issue_relations...

git-svn-id: http://svn.redmine.org/redmine/trunk@21082 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 756d7ed4cf4216de80dd7482e553ab271710dfb9..b8e1dd4140a1559c158f30db879c0fc022578f33 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -264,6 +264,11 @@ module IssuesHelper
       if issue.total_spent_hours == issue.spent_hours
         link_to(l_hours_short(issue.spent_hours), path)
       else
+        # link to global time entries if cross-project subtasks are allowed
+        # in order to show time entries from not descendents projects
+        if %w(system tree hierarchy).include?(Setting.cross_project_subtasks)
+          path = time_entries_path(:issue_id => "~#{issue.id}")
+        end
         s = issue.spent_hours > 0 ? l_hours_short(issue.spent_hours) : ""
         s += " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), path})"
         s.html_safe

diff --git a/test/helpers/issues_helper_test.rb b/test/helpers/issues_helper_test.rb
index a46b44b5b59cb47089d7ad93565623b98de92579..28a520b3e49ed170698603293b26d5748ba28340 100644 (file)
--- a/test/helpers/issues_helper_test.rb
+++ b/test/helpers/issues_helper_test.rb
@@ -375,4 +375,26 @@ class IssuesHelperTest < Redmine::HelperTest
     assert_equal new_project_issue_path(issue.project, params),
                  url_for_new_subtask(issue)
   end
+
+  def test_issue_spent_hours_details_should_link_to_project_time_entries_depending_on_cross_project_setting
+    %w(descendants).each do |setting|
+      with_settings :cross_project_subtasks => setting do
+        TimeEntry.generate!(:issue => Issue.generate!(:parent_issue_id => 1), :hours => 3)
+        TimeEntry.generate!(:issue => Issue.generate!(:parent_issue_id => 1), :hours => 4)
+
+        assert_match "href=\"/projects/ecookbook/time_entries?issue_id=~1\"", issue_spent_hours_details(Issue.find(1))
+      end
+    end
+  end
+
+  def test_issue_spent_hours_details_should_link_to_global_time_entries_depending_on_cross_project_setting
+    %w(system tree hierarchy).each do |setting|
+      with_settings :cross_project_subtasks => setting do
+        TimeEntry.generate!(:issue => Issue.generate!(:parent_issue_id => 1), :hours => 3)
+        TimeEntry.generate!(:issue => Issue.generate!(:parent_issue_id => 1), :hours => 4)
+
+        assert_match "href=\"/time_entries?issue_id=~1\"", issue_spent_hours_details(Issue.find(1))
+      end
+    end
+  end
 end