Actions
Defect #36248
closed
Time entries of sub-projects are not listed when activity is specified in filters
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
Updated by Yuichi HARADA almost 3 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",
Updated by Yuichi HARADA almost 3 years ago
- File 36248.patch 36248.patch added
I created a test. I have attached a patch containing #note-1.
Updated by Go MAEDA almost 3 years ago
- Target version set to 4.2.4
Setting the target version to 4.2.4.
Updated by Marius BĂLTEANU almost 3 years ago
- Status changed from Confirmed to Resolved
- Assignee set to Marius BĂLTEANU
- Resolution set to Fixed
Patch committed, thanks!
Updated by Marius BĂLTEANU almost 3 years ago
- Status changed from Resolved to Closed
Actions