From dd53fb69e7c59b3765136b918d4d42e03a79a85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 10 Aug 2011 19:50:17 -0300 Subject: [PATCH] Some refactors --- lib/simple_form/inputs/base.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/simple_form/inputs/base.rb b/lib/simple_form/inputs/base.rb index 17078797..9a3cbf0b 100644 --- a/lib/simple_form/inputs/base.rb +++ b/lib/simple_form/inputs/base.rb @@ -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