Vote #81720
完了Time entries of sub-projects are not listed when activity is specified in filters
0%
説明
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
!{width:600px;border:1px solid grey;}settings-time-tracking.png!
When the Activity filter is not used
!{width:600px;border:1px solid grey;}spent-time-list-without-activity-fillter.png!
When using the Activity filter
!{width:600px;border:1px solid grey;}spent-time-list-with-activity-fillter.png!
journals
I think the following patch can solve it.
<pre><code class="diff">
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",
</code></pre>
--------------------------------------------------------------------------------
I created a test. I have attached a patch containing #note-1.
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
Setting the target version to 4.2.4.
--------------------------------------------------------------------------------
Patch committed, thanks!
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------