meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 19:47:14 +00:00
Code Issues Releases Wiki Activity

Multiple issue ids in "Related to" filter (#38301).

Browse Source 
Patch by Tomoko Shimizu, Ko Nagase, and Takashi Kato.


git-svn-id: https://svn.redmine.org/redmine/trunk@22156 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2023-03-25 06:27:30 +00:00
parent 53f2aca3ef
commit 0fb007cc02
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/issue_query.rb
View File

@ -723,6 +723,7 @@ class IssueQuery < Query
relation_type = relation_options[:reverse] || relation_type
join_column, target_join_column = target_join_column, join_column
end
ids = value.first.to_s.scan(/\d+/).map(&:to_i).uniq
sql =
case operator
when "*", "!*"
@ -739,7 +740,7 @@ class IssueQuery < Query
" FROM #{IssueRelation.table_name}" \
" WHERE #{IssueRelation.table_name}.relation_type =" \
" '#{self.class.connection.quote_string(relation_type)}'" \
" AND #{IssueRelation.table_name}.#{target_join_column} = #{value.first.to_i})"
" AND #{IssueRelation.table_name}.#{target_join_column} IN (#{ids.join(",")}))"
when "=p", "=!p", "!p"
op = (operator == "!p" ? 'NOT IN' : 'IN')
comp = (operator == "=!p" ? '<>' : '=')

8
test/unit/query_test.rb
View File

@ -1337,9 +1337,17 @@ class QueryTest < ActiveSupport::TestCase
query.filters = {"relates" => {:operator => '=', :values => ['2']}}
assert_equal [1], find_issues_with_query(query).map(&:id).sort
query = IssueQuery.new(:name => '_')
query.filters = {"relates" => {:operator => '=', :values => ['1,2']}}
assert_equal [1, 2, 3], find_issues_with_query(query).map(&:id).sort
query = IssueQuery.new(:name => '_')
query.filters = {"relates" => {:operator => '!', :values => ['1']}}
assert_equal Issue.where.not(:id => [2, 3]).order(:id).ids, find_issues_with_query(query).map(&:id).sort
query = IssueQuery.new(:name => '_')
query.filters = {"relates" => {:operator => '!', :values => ['1,2']}}
assert_equal Issue.where.not(:id => [1, 2, 3]).order(:id).ids, find_issues_with_query(query).map(&:id).sort
end
def test_filter_on_relations_with_any_issues_in_a_project