diff options
| -rw-r--r-- | app/models/time_entry_query.rb | 2 | ||||
| -rw-r--r-- | test/unit/time_entry_query_test.rb | 10 |
2 files changed, 11 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? diff --git a/test/unit/time_entry_query_test.rb b/test/unit/time_entry_query_test.rb index 64b64107a..f02b4e7c5 100644 --- a/test/unit/time_entry_query_test.rb +++ b/test/unit/time_entry_query_test.rb @@ -27,6 +27,16 @@ class TimeEntryQueryTest < ActiveSupport::TestCase :groups_users, :enabled_modules + def test_cross_project_activity_filter_should_propose_non_active_activities + activity = TimeEntryActivity.create!(:name => 'Disabled', :active => false) + assert !activity.active? + + query = TimeEntryQuery.new(:name => '_') + assert options = query.available_filters['activity_id'] + assert values = options[:values] + assert_include ["Disabled", activity.id.to_s], values + end + def test_activity_filter_should_consider_system_and_project_activities TimeEntry.delete_all system = TimeEntryActivity.create!(:name => 'Foo') |