git-svn-id: http://svn.redmine.org/redmine/trunk@14626 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/3.2.0
:type => :list_optional, :values => users_values | :type => :list_optional, :values => users_values | ||||
) unless users_values.empty? | ) unless users_values.empty? | ||||
activities = (project ? project.activities : TimeEntryActivity.shared.active) | |||||
activities = (project ? project.activities : TimeEntryActivity.shared) | |||||
add_available_filter("activity_id", | add_available_filter("activity_id", | ||||
:type => :list, :values => activities.map {|a| [a.name, a.id.to_s]} | :type => :list, :values => activities.map {|a| [a.name, a.id.to_s]} | ||||
) unless activities.empty? | ) unless activities.empty? |
:groups_users, | :groups_users, | ||||
:enabled_modules | :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 | def test_activity_filter_should_consider_system_and_project_activities | ||||
TimeEntry.delete_all | TimeEntry.delete_all | ||||
system = TimeEntryActivity.create!(:name => 'Foo') | system = TimeEntryActivity.create!(:name => 'Foo') |