##// END OF EJS Templates
Merged r7779 from trunk....
Jean-Philippe Lang -
r7878:ff75a959e0eb
parent child
Show More
@@ -62,7 +62,7 protected
62 when 'float'
62 when 'float'
63 begin; Kernel.Float(value); rescue; errors.add(:value, :invalid) end
63 begin; Kernel.Float(value); rescue; errors.add(:value, :invalid) end
64 when 'date'
64 when 'date'
65 errors.add(:value, :not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/
65 errors.add(:value, :not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ && begin; value.to_date; rescue; false end
66 when 'list'
66 when 'list'
67 errors.add(:value, :inclusion) unless custom_field.possible_values.include?(value)
67 errors.add(:value, :inclusion) unless custom_field.possible_values.include?(value)
68 end
68 end
@@ -64,6 +64,8 class CustomValueTest < ActiveSupport::TestCase
64 assert v.valid?
64 assert v.valid?
65 v.value = 'abc'
65 v.value = 'abc'
66 assert !v.valid?
66 assert !v.valid?
67 v.value = '1975-07-33'
68 assert !v.valid?
67 v.value = '1975-07-14'
69 v.value = '1975-07-14'
68 assert v.valid?
70 assert v.valid?
69 end
71 end
General Comments 0
You need to be logged in to leave comments. Login now