Project

General

Profile

Actions

Defect #36248

closed

Time entries of sub-projects are not listed when activity is specified in filters

Added by Yuichi HARADA over 2 years ago. Updated about 2 years ago.

Status:
Closed
Priority:
Normal
Category:
Time tracking
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:
Resolution:
Fixed
Affected version:

Description

If the activity of the parent project is not a system activity, the time entries of the sub-projects are not displayed when the Activity filter is specified in the spent time list of the parent project.

Activity setting of parent project

When the Activity filter is not used

When using the Activity filter


Files

settings-time-tracking.png (124 KB) settings-time-tracking.png Yuichi HARADA, 2021-11-26 05:38
spent-time-list-without-activity-fillter.png (215 KB) spent-time-list-without-activity-fillter.png Yuichi HARADA, 2021-11-26 05:49
spent-time-list-with-activity-fillter.png (115 KB) spent-time-list-with-activity-fillter.png Yuichi HARADA, 2021-11-26 05:50
36248.patch (1.87 KB) 36248.patch Yuichi HARADA, 2021-11-30 04:11
Actions #1

Updated by Yuichi HARADA over 2 years ago

I think the following patch can solve it.

diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb
index 11128cfcd6..5fd4790893 100644
--- a/app/models/time_entry_query.rb
+++ b/app/models/time_entry_query.rb
@@ -88,7 +88,7 @@ class TimeEntryQuery < Query
     activities = (project ? project.activities : TimeEntryActivity.shared)
     add_available_filter(
       "activity_id",
-      :type => :list, :values => activities.map {|a| [a.name, a.id.to_s]}
+      :type => :list, :values => activities.map {|a| [a.name, (a.parent_id || a.id).to_s]}
     )
     add_available_filter(
       "project.status",
Actions #2

Updated by Yuichi HARADA over 2 years ago

I created a test. I have attached a patch containing #note-1.

Actions #3

Updated by Go MAEDA over 2 years ago

  • Status changed from New to Confirmed
Actions #4

Updated by Go MAEDA over 2 years ago

  • Target version set to 4.2.4

Setting the target version to 4.2.4.

Actions #5

Updated by Marius BĂLTEANU about 2 years ago

  • Status changed from Confirmed to Resolved
  • Assignee set to Marius BĂLTEANU
  • Resolution set to Fixed

Patch committed, thanks!

Actions #6

Updated by Marius BĂLTEANU about 2 years ago

  • Status changed from Resolved to Closed
Actions

Also available in: Atom PDF