diff options
| author | Go MAEDA <maeda@farend.jp> | 2022-01-19 13:33:11 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2022-01-19 13:33:11 +0000 |
| commit | f2ae2b9936b3221036e7563b314c13438794615b (patch) | |
| tree | bc2b881a4bc3aa8420b22fadfbceb6615826cf52 /lib/redmine/helpers | |
| parent | 2f8e4231d06b832d2fc16bfc53fa18055ebeca07 (diff) | |
| download | redmine-f2ae2b9936b3221036e7563b314c13438794615b.tar.gz redmine-f2ae2b9936b3221036e7563b314c13438794615b.zip | |
Duplicate activities in time entry report when project-specific activies exist (#20018).
Patch by Yuichi HARADA.
git-svn-id: http://svn.redmine.org/redmine/trunk@21371 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/helpers')
| -rw-r--r-- | lib/redmine/helpers/time_report.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/helpers/time_report.rb b/lib/redmine/helpers/time_report.rb index cac5f2427..2ae5fd8eb 100644 --- a/lib/redmine/helpers/time_report.rb +++ b/lib/redmine/helpers/time_report.rb @@ -122,7 +122,7 @@ module Redmine 'tracker' => {:sql => "#{Issue.table_name}.tracker_id", :klass => Tracker, :label => :label_tracker}, - 'activity' => {:sql => "#{TimeEntry.table_name}.activity_id", + 'activity' => {:sql => "COALESCE(#{TimeEntryActivity.table_name}.parent_id, #{TimeEntryActivity.table_name}.id)", :klass => TimeEntryActivity, :label => :field_activity}, 'issue' => {:sql => "#{TimeEntry.table_name}.issue_id", |