From 0ec5390bdbf74d51a41196210f596ce160078eca Mon Sep 17 00:00:00 2001 From: Pascal Rettig Date: Thu, 26 May 2011 14:19:52 -0400 Subject: [PATCH] Fix to missing check for required --- app/models/content/field.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/content/field.rb b/app/models/content/field.rb index 3ba80ace..59a13769 100644 --- a/app/models/content/field.rb +++ b/app/models/content/field.rb @@ -123,7 +123,7 @@ def set_field_options(options) @@setup_model_procs = { :required => Proc.new { |cls,fld| cls.validates_presence_of fld.model_field.field if fld.model_field.field_options['required'] }, - :required_array => Proc.new { |cls,fld| cls.validate { |mdl| mdl.errors.add(fld.model_field.field, 'is missing') if mdl.send(fld.model_field.field) && mdl.send(fld.model_field.field).reject(&:blank?).length == 0 } }, + :required_array => Proc.new { |cls,fld| cls.validate { |mdl| mdl.errors.add(fld.model_field.field, 'is missing') if options['required'] && mdl.send(fld.model_field.field) && mdl.send(fld.model_field.field).reject(&:blank?).length == 0 } }, :unique => Proc.new { |cls,fld| cls.validates_uniqueness_of fld.model_field.field, :allow_blank => true if fld.model_field.field_options['unique'] }, :regexp => Proc.new { |cls,fld| cls.validates_format_of fld.model_field.field, :with => Regexp.new(fld.model_field.field_options['regexp_code']), :message => fld.model_field.field_options['regexp_message'].to_s, :allow_blank => true if fld.model_field.field_options['regexp'] }, :validates_as_email => Proc.new { |cls,fld| cls.validates_as_email fld.model_field.field },