| @@ -76,7 +76,7 class TimeEntryQuery < Query | |||
|
|
76 | 76 | :type => :list_optional, :values => users_values |
|
|
77 | 77 | ) unless users_values.empty? |
|
|
78 | 78 | |
|
|
79 |
activities = (project ? project.activities : TimeEntryActivity.shared |
|
|
|
79 | activities = (project ? project.activities : TimeEntryActivity.shared) | |
|
|
80 | 80 | add_available_filter("activity_id", |
|
|
81 | 81 | :type => :list, :values => activities.map {|a| [a.name, a.id.to_s]} |
|
|
82 | 82 | ) unless activities.empty? |
| @@ -27,6 +27,16 class TimeEntryQueryTest < ActiveSupport::TestCase | |||
|
|
27 | 27 | :groups_users, |
|
|
28 | 28 | :enabled_modules |
|
|
29 | 29 | |
|
|
30 | def test_cross_project_activity_filter_should_propose_non_active_activities | |
|
|
31 | activity = TimeEntryActivity.create!(:name => 'Disabled', :active => false) | |
|
|
32 | assert !activity.active? | |
|
|
33 | ||
|
|
34 | query = TimeEntryQuery.new(:name => '_') | |
|
|
35 | assert options = query.available_filters['activity_id'] | |
|
|
36 | assert values = options[:values] | |
|
|
37 | assert_include ["Disabled", activity.id.to_s], values | |
|
|
38 | end | |
|
|
39 | ||
|
|
30 | 40 | def test_activity_filter_should_consider_system_and_project_activities |
|
|
31 | 41 | TimeEntry.delete_all |
|
|
32 | 42 | system = TimeEntryActivity.create!(:name => 'Foo') |
General Comments 0
You need to be logged in to leave comments.
Login now