Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions lib/bootstrap_form/components/validation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,23 @@ module Validation
private

def error?(name)
object.respond_to?(:errors) && !(name.nil? || object.errors[name].empty?)
name && object.respond_to?(:errors) &&
(object.errors[name].any? || (name.end_with?("_id") && object.errors[name[0..-4]].any?))
end

def required_attribute?(obj, attribute)
return false unless obj && attribute

target = obj.instance_of?(Class) ? obj : obj.class
return false unless target.respond_to? :validators_on

target_validators = if target.respond_to? :validators_on
target.validators_on(attribute).map(&:class)
else
[]
end
presence_validator?(target_validators(target, attribute))
end

presence_validator?(target_validators)
def target_validators(target, attribute)
target_validators = target.validators_on(attribute).map(&:class)
target_validators.concat target.validators_on(attribute[0..-4]).map(&:class) if attribute.end_with?("_id")
target_validators
end

def presence_validator?(target_validators)
Expand Down Expand Up @@ -54,7 +56,9 @@ def generate_error(name)
end

def get_error_messages(name)
object.errors[name].join(", ")
messages = object.errors[name]
messages.concat object.errors[name[0..-4]] if name.end_with?("_id")
messages.join(", ")
end
end
end
Expand Down