diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-09-30 18:03:13 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-09-30 18:03:13 +0000 |
| commit | 44644679908ca0d292a9aa5113d5d93d2aa754f6 (patch) | |
| tree | f5304232e63ed9d7fa016f0a81b1279532c2ab42 /app | |
| parent | 2d78003c87099fb6a832025027701e9456727727 (diff) | |
| download | redmine-44644679908ca0d292a9aa5113d5d93d2aa754f6.tar.gz redmine-44644679908ca0d292a9aa5113d5d93d2aa754f6.zip | |
Include inactive activities in time entries filter (#20117).
git-svn-id: http://svn.redmine.org/redmine/trunk@14626 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 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? |