kotovalexarian-likes-github
/
heartcombo--simple_form
mirror of https://github.com/heartcombo/simple_form.git
1
0
Fork 0
Code Releases Activity

Some refactors

This commit is contained in:
Rafael Mendonça França 2011-08-10 19:50:17 -03:00
parent a45a31ea6d
commit dd53fb69e7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/simple_form/inputs/base.rb
View File

@ -67,7 +67,7 @@ module SimpleForm
options[:required]
elsif has_validators?
(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
else
attribute_required_by_default?
@ -96,12 +96,12 @@ module SimpleForm
end
def conditional_validators?(validator)
validator.options.include?(:if) || validator.options.include?(:unless)
validator.options.include?(:if) || validator.options.include?(:unless)
end
def action_validators?(validator)
validator.options.include?(:on) ? ACTIONS[validator.options[:on].to_sym] == lookup_action : true
end
!validator.options.include?(:on) || ACTIONS[validator.options[:on].to_sym] == lookup_action
end
def attribute_required_by_default?
SimpleForm.required_by_default