kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct filters for int,float custom fields. #498

This commit is contained in:
Felix Schäfer 2011-07-08 21:39:36 +02:00
parent 63d8264320
commit 7c4abeb8d3
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/query.rb
View File

@ -587,9 +587,17 @@ class Query < ActiveRecord::Base
sql = "#{db_table}.#{db_field} IS NOT NULL"
sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
when ">="
sql = "#{db_table}.#{db_field} >= #{value.first.to_i}"
if is_custom_filter
sql = "#{db_table}.#{db_field} != '' AND CAST(#{db_table}.#{db_field} AS decimal(60,4)) >= #{value.first.to_f}"
else
sql = "#{db_table}.#{db_field} >= #{value.first.to_f}"
end
when "<="
sql = "#{db_table}.#{db_field} <= #{value.first.to_i}"
if is_custom_filter
sql = "#{db_table}.#{db_field} != '' AND CAST(#{db_table}.#{db_field} AS decimal(60,4)) <= #{value.first.to_f}"
else
sql = "#{db_table}.#{db_field} <= #{value.first.to_f}"
end
when "o"
sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
when "c"
@ -629,6 +637,8 @@ class Query < ActiveRecord::Base
custom_fields.select(&:is_filter?).each do |field|
case field.field_format
when "int", "float"
options = { :type => :integer, :order => 20 }
when "text"
options = { :type => :text, :order => 20 }
when "list"