Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-01 04:09:56 +01:00
Code Issues Packages Projects Releases Activity

Merged r21499, r21500 and r21501 to 4.2-stable (#30924).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21504 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2022-03-27 21:33:47 +00:00
parent 5b44366d8d
commit 871bc44301
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/issue_query.rb
View File

@@ -550,7 +550,8 @@ class IssueQuery < Query
def sql_for_fixed_version_status_field(field, operator, value)
where = sql_for_field(field, operator, value, Version.table_name, "status")
version_ids = versions(:conditions => [where]).map(&:id)
version_id_scope = project ? project.shared_versions : Version.visible
version_ids = version_id_scope.where(where).pluck(:id)
nl = operator == "!" ? "#{Issue.table_name}.fixed_version_id IS NULL OR" : ''
"(#{nl} #{sql_for_field("fixed_version_id", "=", version_ids, Issue.table_name, "fixed_version_id")})"
@@ -558,7 +559,8 @@ class IssueQuery < Query
def sql_for_fixed_version_due_date_field(field, operator, value)
where = sql_for_field(field, operator, value, Version.table_name, "effective_date")
version_ids = versions(:conditions => [where]).map(&:id)
version_id_scope = project ? project.shared_versions : Version.visible
version_ids = version_id_scope.where(where).pluck(:id)
nl = operator == "!*" ? "#{Issue.table_name}.fixed_version_id IS NULL OR" : ''
"(#{nl} #{sql_for_field("fixed_version_id", "=", version_ids, Issue.table_name, "fixed_version_id")})"

15
test/unit/query_test.rb
View File

@@ -1194,6 +1194,21 @@ class QueryTest < ActiveSupport::TestCase
assert_equal [1, 3, 7, 8], find_issues_with_query(query).map(&:id).uniq.sort
end
def test_filter_on_fixed_version_status_respects_sharing
issue = Issue.generate!(:project_id => 1, :fixed_version_id => 7)
filter_name = "fixed_version.status"
query = IssueQuery.new(:name => '_', :project => Project.find(1))
assert_include filter_name, query.available_filters.keys
query.filters = {filter_name => {:operator => '=', :values => ['open']}}
assert_include issue, find_issues_with_query(query)
query = IssueQuery.new(:name => '_', :project => Project.find(1))
query.filters = {filter_name => {:operator => '=', :values => ['closed']}}
assert_not_includes find_issues_with_query(query), issue
end
def test_filter_on_version_custom_field
field = IssueCustomField.generate!(:field_format => 'version', :is_filter => true)
issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {field.id.to_s => '2'})