From f2ae2b9936b3221036e7563b314c13438794615b Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 19 Jan 2022 13:33:11 +0000 Subject: 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 --- lib/redmine/helpers/time_report.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/redmine/helpers') 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", -- cgit v1.2.3