Handle min_length and max_length nil values (#17446).

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13328 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2014-07-14 15:50:41 +00:00
parent fba5b43377
commit fd8df67ddb

View File

@@ -352,8 +352,8 @@ class CustomField < ActiveRecord::Base
errs = []
unless value.to_s == ''
errs << ::I18n.t('activerecord.errors.messages.invalid') unless regexp.blank? or value =~ Regexp.new(regexp)
errs << ::I18n.t('activerecord.errors.messages.too_short', :count => min_length) if min_length > 0 and value.length < min_length
errs << ::I18n.t('activerecord.errors.messages.too_long', :count => max_length) if max_length > 0 and value.length > max_length
errs << ::I18n.t('activerecord.errors.messages.too_short', :count => min_length) if min_length && min_length > 0 && value.length < min_length
errs << ::I18n.t('activerecord.errors.messages.too_long', :count => max_length) if max_length && max_length > 0 && value.length > max_length
# Format specific validations
case field_format