Browse Source

Issue description filter's 'none' operator does not match issues with blank descriptions (#25077).

Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16378 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.4.0
Jean-Philippe Lang 7 years ago
parent
commit
58ee62e239
2 changed files with 14 additions and 2 deletions
  1. 2
    2
      app/models/query.rb
  2. 12
    0
      test/unit/query_test.rb

+ 2
- 2
app/models/query.rb View File

@@ -984,7 +984,7 @@ class Query < ActiveRecord::Base
" SELECT customized_id FROM #{CustomValue.table_name}" +
" WHERE customized_type='#{target_class}' AND custom_field_id=#{chained_custom_field_id}" +
" AND #{sql_for_field(field, operator, value, CustomValue.table_name, 'value')}))"
end

def sql_for_custom_field_attribute(field, operator, value, custom_field_id, attribute)
@@ -1048,7 +1048,7 @@ class Query < ActiveRecord::Base
end
when "!*"
sql = "#{db_table}.#{db_field} IS NULL"
sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
sql << " OR #{db_table}.#{db_field} = ''" if (is_custom_filter || [:text, :string].include?(type_for(field)))
when "*"
sql = "#{db_table}.#{db_field} IS NOT NULL"
sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter

+ 12
- 0
test/unit/query_test.rb View File

@@ -217,6 +217,18 @@ class QueryTest < ActiveSupport::TestCase
assert issues.all? {|i| i.custom_field_value(2).blank?}
end

def test_operator_none_for_text
query = IssueQuery.new(:name => '_')
query.add_filter('status_id', '*', [''])
query.add_filter('description', '!*', [''])
assert query.has_filter?('description')
issues = find_issues_with_query(query)

assert issues.any?
assert issues.all? {|i| i.description.blank?}
assert_equal [11, 12], issues.map(&:id).sort
end

def test_operator_all
query = IssueQuery.new(:project => Project.find(1), :name => '_')
query.add_filter('fixed_version_id', '*', [''])

Loading…
Cancel
Save