##// END OF EJS Templates
jro_apps » redmine
RSS
Include inactive activities in time entries filter (#20117)....
Jean-Philippe Lang -
r14244:44644679908c
parent child
Show More
Side by Side Unified
Context file:
r14244:44644679908c Loading diff...:
Show file before | Show file after | Hide comments
@@ -76,7 +76,7 class TimeEntryQuery < Query
76 :type => :list_optional, :values => users_values
76 :type => :list_optional, :values => users_values
77 ) unless users_values.empty?
77 ) unless users_values.empty?
78
78
79 activities = (project ? project.activities : TimeEntryActivity.shared.active)
79 activities = (project ? project.activities : TimeEntryActivity.shared)
80 add_available_filter("activity_id",
80 add_available_filter("activity_id",
81 :type => :list, :values => activities.map {|a| [a.name, a.id.to_s]}
81 :type => :list, :values => activities.map {|a| [a.name, a.id.to_s]}
82 ) unless activities.empty?
82 ) unless activities.empty?
Show file before | Show file after | Hide comments
@@ -27,6 +27,16 class TimeEntryQueryTest < ActiveSupport::TestCase
27 :groups_users,
27 :groups_users,
28 :enabled_modules
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 def test_activity_filter_should_consider_system_and_project_activities
40 def test_activity_filter_should_consider_system_and_project_activities
31 TimeEntry.delete_all
41 TimeEntry.delete_all
32 system = TimeEntryActivity.create!(:name => 'Foo')
42 system = TimeEntryActivity.create!(:name => 'Foo')
General Comments 0
You need to be logged in to leave comments. Login now