Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-03 03:46:19 +01:00
Code Issues Packages Projects Releases Activity

Fix filter values for fixed version id (#26667).

Browse Source 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16999 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-10-15 11:53:49 +00:00
parent 0a3e85b92d
commit cb73fc58f2
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/time_entry_query.rb
View File

@@ -64,7 +64,7 @@ class TimeEntryQuery < Query
add_available_filter("issue.fixed_version_id", add_available_filter("issue.fixed_version_id",
:type => :list, :type => :list,
:name => l("label_attribute_of_issue", :name => l(:field_fixed_version)), :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", add_available_filter("user_id",
:type => :list_optional, :values => lambda { author_values } :type => :list_optional, :values => lambda { author_values }

14
test/functional/queries_controller_test.rb
View File

@@ -581,6 +581,20 @@ class QueriesControllerTest < Redmine::ControllerTest
assert_include ["eCookbook - 2.0", "3", "open"], json assert_include ["eCookbook - 2.0", "3", "open"], json
end 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 def test_filter_without_project_id_should_return_filter_values
@request.session[:user_id] = 2 @request.session[:user_id] = 2
get :filter, :params => { get :filter, :params => {