From 44644679908ca0d292a9aa5113d5d93d2aa754f6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 30 Sep 2015 18:03:13 +0000 Subject: Include inactive activities in time entries filter (#20117). git-svn-id: http://svn.redmine.org/redmine/trunk@14626 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/time_entry_query.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb index 0d7fde484..302a4246f 100644 --- a/app/models/time_entry_query.rb +++ b/app/models/time_entry_query.rb @@ -76,7 +76,7 @@ class TimeEntryQuery < Query :type => :list_optional, :values => users_values ) unless users_values.empty? - activities = (project ? project.activities : TimeEntryActivity.shared.active) + activities = (project ? project.activities : TimeEntryActivity.shared) add_available_filter("activity_id", :type => :list, :values => activities.map {|a| [a.name, a.id.to_s]} ) unless activities.empty? -- cgit v1.2.3