jro_apps/redmine Commit - r1347:64474802f9dd

Fixes custom field filters behaviour (#1078)....

Jean-Philippe Lang -

r1347:64474802f9dd

parent child

Context file:

r1347:64474802f9dd

Collapse all files

app/models/query.rb +3 -3

                     # custom field
                     db_table = CustomValue.table_name
                     db_field = 'value'
-                    sql << "#{Issue.table_name}.id IN (SELECT #{db_table}.customized_id FROM #{db_table} where #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} AND "
+                    sql << "#{Issue.table_name}.id IN (SELECT #{Issue.table_name}.id FROM #{Issue.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} WHERE "
                   else
                     # regular field
                     db_table = Issue.table_name
                   when "!"
                     sql = sql + "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
                   when "!*"
-                    sql = sql + "#{db_table}.#{db_field} IS NULL"
+                    sql = sql + "#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} = ''"
                   when "*"
-                    sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
+                    sql = sql + "#{db_table}.#{db_field} IS NOT NULL AND #{db_table}.#{db_field} <> ''"
                   when ">="
                     sql = sql + "#{db_table}.#{db_field} >= #{v.first.to_i}"
                   when "<="

test/unit/query_test.rb +1 -1

               def test_query_with_multiple_custom_fields
                 query = Query.find(1)
                 assert query.valid?
-                assert query.statement.include?("custom_values.value IN ('MySQL')")
+                assert query.statement.include?("#{CustomValue.table_name}.value IN ('MySQL')")
                 issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
                 assert_equal 1, issues.length
                 assert_equal Issue.find(3), issues.first

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages