Reject non numeric values for numeric fields.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6228 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-10 18:19:21 +00:00
parent bf15b06d98
commit bedbb166b7
2 changed files with 14 additions and 1 deletions
@@ -278,7 +278,11 @@ class Query < ActiveRecord::Base
      #  allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
      #  filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
      #end
-      filters[field] = {:operator => operator, :values => (values || ['']) }
+      values ||= ['']
+      if filter_options[:type] == :integer
+        values = values.select {|v| v.blank? || v.match(/^\d+(\.\d+)?$/) }
+      end
+      filters[field] = {:operator => operator, :values => values }
    end
  end