jro_apps/redmine Commit - r6145:6c5b29bb681b

More accurate date validation....

Jean-Philippe Lang -

r6145:6c5b29bb681b

parent child

Context file:

r6145:6c5b29bb681b

app/models/query.rb +1 -1

                     when :date, :date_past
                       case operator_for(field)
                       when "=", ">=", "<=", "><"
-                        errors.add(label_for(field), :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^\d{4}-\d{2}-\d{2}$/) }
+                        errors.add(label_for(field), :invalid) if values_for(field).detect {|v| v.present? && (!v.match(/^\d{4}-\d{2}-\d{2}$/) || (Date.parse(v) rescue nil).nil?) }
                       when ">t-", "<t-", "t-"
                         errors.add(label_for(field), :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^\d+$/) }
                       end

test/unit/query_test.rb +8 0

                 assert !query.valid?
               end
+              def test_date_filter_should_not_accept_invalid_date_values
+                query = Query.new(:name => '_')
+                query.add_filter('created_on', '=', ['2011-01-34'])
+                assert query.has_filter?('created_on')
+                assert !query.valid?
+              end
               def test_relative_date_filter_should_not_accept_non_integer_values
                 query = Query.new(:name => '_')
                 query.add_filter('created_on', '>t-', ['a'])

General Comments 0

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

No TODOs yet

	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