Some refactors
This commit is contained in:
parent
a45a31ea6d
commit
dd53fb69e7
|
@ -67,7 +67,7 @@ module SimpleForm
|
||||||
options[:required]
|
options[:required]
|
||||||
elsif has_validators?
|
elsif has_validators?
|
||||||
(attribute_validators + reflection_validators).any? do |v|
|
(attribute_validators + reflection_validators).any? do |v|
|
||||||
v.kind == :presence && !conditional_validators?(v) && action_validators?(v)
|
v.kind == :presence && !conditional_validators?(v) && action_validators?(v)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
attribute_required_by_default?
|
attribute_required_by_default?
|
||||||
|
@ -96,12 +96,12 @@ module SimpleForm
|
||||||
end
|
end
|
||||||
|
|
||||||
def conditional_validators?(validator)
|
def conditional_validators?(validator)
|
||||||
validator.options.include?(:if) || validator.options.include?(:unless)
|
validator.options.include?(:if) || validator.options.include?(:unless)
|
||||||
end
|
end
|
||||||
|
|
||||||
def action_validators?(validator)
|
def action_validators?(validator)
|
||||||
validator.options.include?(:on) ? ACTIONS[validator.options[:on].to_sym] == lookup_action : true
|
!validator.options.include?(:on) || ACTIONS[validator.options[:on].to_sym] == lookup_action
|
||||||
end
|
end
|
||||||
|
|
||||||
def attribute_required_by_default?
|
def attribute_required_by_default?
|
||||||
SimpleForm.required_by_default
|
SimpleForm.required_by_default
|
||||||
|
|
Loading…
Reference in New Issue