Cleanup `Minlength` internals using the same format as `Maxlength`.
This commit is contained in:
parent
1e92d6917f
commit
14fa8dc066
|
@ -15,10 +15,7 @@ module SimpleForm
|
|||
minlength
|
||||
else
|
||||
length_validator = find_length_validator
|
||||
|
||||
if length_validator && !has_tokenizer?(length_validator)
|
||||
length_validator.options[:is] || length_validator.options[:minimum]
|
||||
end
|
||||
minimum_length_value_from(length_validator)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -29,6 +26,22 @@ module SimpleForm
|
|||
def has_tokenizer?(length_validator)
|
||||
length_validator.options[:tokenizer]
|
||||
end
|
||||
|
||||
# Use validation with tokenizer if version of Rails is less than 5,
|
||||
# if not validate without the tokenizer, if version is greater than Rails 4.
|
||||
if ActionPack::VERSION::STRING < '5'
|
||||
def minimum_length_value_from(length_validator)
|
||||
if length_validator && !has_tokenizer?(length_validator)
|
||||
length_validator.options[:is] || length_validator.options[:minimum]
|
||||
end
|
||||
end
|
||||
elsif ActionPack::VERSION::STRING >= '5'
|
||||
def minimum_length_value_from(length_validator)
|
||||
if length_validator
|
||||
length_validator.options[:is] || length_validator.options[:minimum]
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue