##// END OF EJS Templates
jro_apps » redmine
RSS
Backported r12938 (#16169)....
Jean-Philippe Lang -
r12665:40abbfa82d97
parent child
Show More
Side by Side Unified
Context file:
r12665:40abbfa82d97 Loading diff...:
Show file before | Show file after | Hide comments
@@ -350,7 +350,7 class CustomField < ActiveRecord::Base
350 # Returns the error message for the given value regarding its format
350 # Returns the error message for the given value regarding its format
351 def validate_field_value_format(value)
351 def validate_field_value_format(value)
352 errs = []
352 errs = []
353 if value.present?
353 unless value.to_s == ''
354 errs << ::I18n.t('activerecord.errors.messages.invalid') unless regexp.blank? or value =~ Regexp.new(regexp)
354 errs << ::I18n.t('activerecord.errors.messages.invalid') unless regexp.blank? or value =~ Regexp.new(regexp)
355 errs << ::I18n.t('activerecord.errors.messages.too_short', :count => min_length) if min_length > 0 and value.length < min_length
355 errs << ::I18n.t('activerecord.errors.messages.too_short', :count => min_length) if min_length > 0 and value.length < min_length
356 errs << ::I18n.t('activerecord.errors.messages.too_long', :count => max_length) if max_length > 0 and value.length > max_length
356 errs << ::I18n.t('activerecord.errors.messages.too_long', :count => max_length) if max_length > 0 and value.length > max_length
Show file before | Show file after | Hide comments
@@ -146,6 +146,7 class CustomFieldTest < ActiveSupport::TestCase
146
146
147 assert f.valid_field_value?(nil)
147 assert f.valid_field_value?(nil)
148 assert f.valid_field_value?('')
148 assert f.valid_field_value?('')
149 assert !f.valid_field_value?(' ')
149 assert f.valid_field_value?('a' * 2)
150 assert f.valid_field_value?('a' * 2)
150 assert !f.valid_field_value?('a')
151 assert !f.valid_field_value?('a')
151 assert !f.valid_field_value?('a' * 6)
152 assert !f.valid_field_value?('a' * 6)
@@ -156,6 +157,7 class CustomFieldTest < ActiveSupport::TestCase
156
157
157 assert f.valid_field_value?(nil)
158 assert f.valid_field_value?(nil)
158 assert f.valid_field_value?('')
159 assert f.valid_field_value?('')
160 assert !f.valid_field_value?(' ')
159 assert f.valid_field_value?('ABC')
161 assert f.valid_field_value?('ABC')
160 assert !f.valid_field_value?('abc')
162 assert !f.valid_field_value?('abc')
161 end
163 end
@@ -165,6 +167,7 class CustomFieldTest < ActiveSupport::TestCase
165
167
166 assert f.valid_field_value?(nil)
168 assert f.valid_field_value?(nil)
167 assert f.valid_field_value?('')
169 assert f.valid_field_value?('')
170 assert !f.valid_field_value?(' ')
168 assert f.valid_field_value?('1975-07-14')
171 assert f.valid_field_value?('1975-07-14')
169 assert !f.valid_field_value?('1975-07-33')
172 assert !f.valid_field_value?('1975-07-33')
170 assert !f.valid_field_value?('abc')
173 assert !f.valid_field_value?('abc')
@@ -175,6 +178,7 class CustomFieldTest < ActiveSupport::TestCase
175
178
176 assert f.valid_field_value?(nil)
179 assert f.valid_field_value?(nil)
177 assert f.valid_field_value?('')
180 assert f.valid_field_value?('')
181 assert !f.valid_field_value?(' ')
178 assert f.valid_field_value?('value2')
182 assert f.valid_field_value?('value2')
179 assert !f.valid_field_value?('abc')
183 assert !f.valid_field_value?('abc')
180 end
184 end
@@ -184,6 +188,7 class CustomFieldTest < ActiveSupport::TestCase
184
188
185 assert f.valid_field_value?(nil)
189 assert f.valid_field_value?(nil)
186 assert f.valid_field_value?('')
190 assert f.valid_field_value?('')
191 assert !f.valid_field_value?(' ')
187 assert f.valid_field_value?('123')
192 assert f.valid_field_value?('123')
188 assert f.valid_field_value?('+123')
193 assert f.valid_field_value?('+123')
189 assert f.valid_field_value?('-123')
194 assert f.valid_field_value?('-123')
@@ -195,6 +200,7 class CustomFieldTest < ActiveSupport::TestCase
195
200
196 assert f.valid_field_value?(nil)
201 assert f.valid_field_value?(nil)
197 assert f.valid_field_value?('')
202 assert f.valid_field_value?('')
203 assert !f.valid_field_value?(' ')
198 assert f.valid_field_value?('11.2')
204 assert f.valid_field_value?('11.2')
199 assert f.valid_field_value?('-6.250')
205 assert f.valid_field_value?('-6.250')
200 assert f.valid_field_value?('5')
206 assert f.valid_field_value?('5')
@@ -206,9 +212,11 class CustomFieldTest < ActiveSupport::TestCase
206
212
207 assert f.valid_field_value?(nil)
213 assert f.valid_field_value?(nil)
208 assert f.valid_field_value?('')
214 assert f.valid_field_value?('')
215 assert !f.valid_field_value?(' ')
209 assert f.valid_field_value?([])
216 assert f.valid_field_value?([])
210 assert f.valid_field_value?([nil])
217 assert f.valid_field_value?([nil])
211 assert f.valid_field_value?([''])
218 assert f.valid_field_value?([''])
219 assert !f.valid_field_value?([' '])
212
220
213 assert f.valid_field_value?('value2')
221 assert f.valid_field_value?('value2')
214 assert !f.valid_field_value?('abc')
222 assert !f.valid_field_value?('abc')
General Comments 0
You need to be logged in to leave comments. Login now