diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2021-07-27 20:38:56 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2021-07-27 20:38:56 +0000 |
| commit | 1613c3193c7dda686980bc0552c236c84f11d315 (patch) | |
| tree | b5bc171c5f758404e46f6c5d053e879483253a3e /app | |
| parent | ea05f03348923d7edb02713f8c5cdc5f92d7bf13 (diff) | |
| download | redmine-1613c3193c7dda686980bc0552c236c84f11d315.tar.gz redmine-1613c3193c7dda686980bc0552c236c84f11d315.zip | |
Merged r21085 to 4.2-stable (#35134).
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@21092 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/issues_helper.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 756d7ed4c..b8e1dd414 100644 --- 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 |