lib/validatable_class_methods.rb in validatable-1.3.2 vs lib/validatable_class_methods.rb in validatable-1.3.4
- old
+ new
@@ -198,21 +198,27 @@
def validate_children(instance, groups) #:nodoc:
self.children_to_validate.each do |child_validation|
next unless child_validation.should_validate?(instance)
child = instance.send child_validation.attribute
child.valid?(*groups)
- child.errors.each do |attribute, message|
- add_error(instance, child_validation.map[attribute.to_sym] || attribute, message)
+ child.errors.each do |attribute, messages|
+ if messages.is_a?(String)
+ add_error(instance, child_validation.map[attribute.to_sym] || attribute, messages)
+ else
+ messages.each do |message|
+ add_error(instance, child_validation.map[attribute.to_sym] || attribute, message)
+ end
+ end
end
end
end
def validations #:nodoc:
@validations ||= []
end
- def add_error(instance, attribute, message) #:nodoc:
- instance.errors.add(attribute, message)
+ def add_error(instance, attribute, msg) #:nodoc:
+ instance.errors.add(attribute, msg)
end
protected
def add_validations(args, klass) #:nodoc:
\ No newline at end of file