Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-31 11:50:13 +01:00
Code Issues Packages Projects Releases Activity

Merged r16504 (#25478).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16521 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-04-08 07:37:37 +00:00
parent f3821dcbda
commit 2af7d986d9
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/issue_query.rb
View File

@@ -550,7 +550,7 @@ class IssueQuery < Query
if relation_options[:sym] == field && !options[:reverse]
sqls = [sql, sql_for_relations(field, operator, value, :reverse => true)]
sql = sqls.join(["!", "!*", "!p"].include?(operator) ? " AND " : " OR ")
sql = sqls.join(["!", "!*", "!p", '!o'].include?(operator) ? " AND " : " OR ")
end
"(#{sql})"
end

16
test/unit/query_test.rb
View File

@@ -897,7 +897,7 @@ class QueryTest < ActiveSupport::TestCase
assert_include 2, ids
end
def test_filter_on_relations_with_no_open_issues
def test_filter_on_blocked_by_no_open_issues
IssueRelation.delete_all
# Issue 1 is blocked by 8, which is closed
IssueRelation.create!(:relation_type => "blocked", :issue_from => Issue.find(1), :issue_to => Issue.find(8))
@@ -911,6 +911,20 @@ class QueryTest < ActiveSupport::TestCase
assert_include 1, ids
end
def test_filter_on_related_with_no_open_issues
IssueRelation.delete_all
# Issue 1 is blocked by 8, which is closed
IssueRelation.create!(relation_type: 'relates', issue_from: Issue.find(1), issue_to: Issue.find(8))
# Issue 2 is blocked by 3, which is open
IssueRelation.create!(relation_type: 'relates', issue_from: Issue.find(2), issue_to: Issue.find(3))
query = IssueQuery.new(:name => '_')
query.filters = { 'relates' => { operator: '!o', values: [''] } }
ids = find_issues_with_query(query).map(&:id)
assert_equal [], ids & [2]
assert_include 1, ids
end
def test_filter_on_relations_with_no_issues
IssueRelation.delete_all
IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))