diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2022-02-20 18:50:22 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2022-02-20 18:50:22 +0000 |
| commit | 9a738c2069468282a70932c6db6d5c6b7ba24df4 (patch) | |
| tree | 8dfd4a1b0f1651cdd4e1528d59431b11fdfc748c /app | |
| parent | 3e9f0023a197c39109292c52507b1749cb7d4e6c (diff) | |
| download | redmine-9a738c2069468282a70932c6db6d5c6b7ba24df4.tar.gz redmine-9a738c2069468282a70932c6db6d5c6b7ba24df4.zip | |
Fix time entries of sub-projects are not listed when activity is specified in filters (#36248).
Patch by Yuichi HARADA.
git-svn-id: http://svn.redmine.org/redmine/trunk@21423 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/time_entry_query.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb index 64ba53b6f..3b884820f 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", |