Only check for existence of validators when trying to find them
This allows a bit of cleanup on some components which are always checking for has_validators? before doing the validators lookup.
This commit is contained in:
parent
04778b99b4
commit
89a6829ded
|
@ -11,7 +11,7 @@ module SimpleForm
|
|||
|
||||
def maximum_length_from_validation
|
||||
if options[:maxlength] == true
|
||||
if has_validators? && (length_validator = find_length_validator)
|
||||
if length_validator = find_length_validator
|
||||
length_validator.options[:maximum]
|
||||
end
|
||||
else
|
||||
|
|
|
@ -2,8 +2,6 @@ module SimpleForm
|
|||
module Components
|
||||
module MinMax
|
||||
def min_max
|
||||
return unless has_validators?
|
||||
|
||||
if numeric_validator = find_numericality_validator
|
||||
validator_options = numeric_validator.options
|
||||
input_html_options[:min] ||= minimum_value(validator_options)
|
||||
|
@ -48,4 +46,4 @@ module SimpleForm
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -11,7 +11,7 @@ module SimpleForm
|
|||
|
||||
def pattern_source
|
||||
if options[:pattern] == true
|
||||
if has_validators? && (pattern_validator = find_pattern_validator)
|
||||
if pattern_validator = find_pattern_validator
|
||||
pattern_validator.options[:with].source
|
||||
end
|
||||
else
|
||||
|
|
|
@ -37,7 +37,7 @@ module SimpleForm
|
|||
end
|
||||
|
||||
def find_validator(validator)
|
||||
attribute_validators.find { |v| validator === v }
|
||||
attribute_validators.find { |v| validator === v } if has_validators?
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue