meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 11:43:08 +00:00
Code Issues Releases Wiki Activity

Merged r21686 and r21687 to 5.0-stable (#36940).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21690 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2022-06-28 06:49:22 +00:00
parent 94ec29e9df
commit 9aa34eb651
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/query.rb
View File

@ -1176,7 +1176,7 @@ class Query < ActiveRecord::Base
end
filter = available_filters[field]
target_class = filter[:through].format.target_class
target_class = filter[:through].format.target_class.base_class
"#{queried_table_name}.id #{not_in} IN (" +
"SELECT customized_id FROM #{CustomValue.table_name}" +

18
test/unit/query_test.rb
View File

@ -948,6 +948,24 @@ class QueryTest < ActiveSupport::TestCase
assert_equal issue1, result.first
end
def test_filter_on_chained_user_custom_field
user = User.find(2)
User.current = user
user_cf = UserCustomField.find(4)
user_cf.update! is_filter: true
issue_cf = IssueCustomField.create!(:field_format => 'user', :is_for_all => true, :is_filter => true, :name => 'User custom field', :tracker_ids => [1])
issue1 = Issue.create!(:project_id => 1, :tracker_id => 1, :custom_field_values => {issue_cf.id.to_s => '2'}, :subject => 'Test', :author_id => 1)
query = IssueQuery.new(:name => '_', :project => Project.find(1))
query.filters = {"cf_#{issue_cf.id}.cf_#{user_cf.id}" => {:operator => '~', :values => ['01 42']}}
result = query.issues
assert_equal 1, result.size
assert_equal issue1, result.first
end
def test_filter_on_chained_user_custom_field_of_type_float
user_cf = UserCustomField.find(5)
user_cf.update! is_filter: true