diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb index bc7ef3b..bad39f8 100644 --- a/app/models/time_entry_query.rb +++ b/app/models/time_entry_query.rb @@ -65,7 +65,7 @@ class TimeEntryQuery < Query add_available_filter("issue.fixed_version_id", :type => :list, :name => l("label_attribute_of_issue", :name => l(:field_fixed_version)), - :values => lambda { fixed_version_values }) if project + :values => lambda { fixed_version_values }) add_available_filter("user_id", :type => :list_optional, :values => lambda { author_values } diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb index 5149a44..4c8b59f 100644 --- a/test/functional/queries_controller_test.rb +++ b/test/functional/queries_controller_test.rb @@ -581,6 +581,20 @@ class QueriesControllerTest < Redmine::ControllerTest assert_include ["eCookbook - 2.0", "3", "open"], json end + def test_version_filter_time_entries_with_project_id_should_return_filter_values + @request.session[:user_id] = 2 + get :filter, :params => { + :project_id => 1, + :type => 'TimeEntryQuery', + :name => 'issue.fixed_version_id' + } + + assert_response :success + assert_equal 'application/json', response.content_type + json = ActiveSupport::JSON.decode(response.body) + assert_include ["eCookbook - 2.0", "3", "open"], json + end + def test_filter_without_project_id_should_return_filter_values @request.session[:user_id] = 2 get :filter, :params => {