|
|
@ -3,9 +3,9 @@ class CaseLogValidator < ActiveModel::Validator |
|
|
|
def validate_tenant_age(record, validation_regex) |
|
|
|
def validate_tenant_age(record, validation_regex) |
|
|
|
regexp = Regexp.new validation_regex |
|
|
|
regexp = Regexp.new validation_regex |
|
|
|
if !record.tenant_age? |
|
|
|
if !record.tenant_age? |
|
|
|
record.errors.add :base, "Tenant age can't be blank" |
|
|
|
record.errors.add :tenant_age, "Tenant age can't be blank" |
|
|
|
elsif !(record.tenant_age.to_s =~ regexp) |
|
|
|
elsif !(record.tenant_age.to_s =~ regexp) |
|
|
|
record.errors.add :base, "Tenant age must be between 0 and 100" |
|
|
|
record.errors.add :tenant_age, "Tenant age must be between 0 and 100" |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
@ -14,7 +14,7 @@ class CaseLogValidator < ActiveModel::Validator |
|
|
|
validation_regex = options[:validation] |
|
|
|
validation_regex = options[:validation] |
|
|
|
if question_to_validate == "tenant_code" |
|
|
|
if question_to_validate == "tenant_code" |
|
|
|
if !record.tenant_code? |
|
|
|
if !record.tenant_code? |
|
|
|
record.errors.add :base, "Tenant code can't be blank" |
|
|
|
record.errors.add :tenant_code, "Tenant code can't be blank" |
|
|
|
end |
|
|
|
end |
|
|
|
elsif question_to_validate == "tenant_age" |
|
|
|
elsif question_to_validate == "tenant_age" |
|
|
|
validate_tenant_age(record, validation_regex) |
|
|
|
validate_tenant_age(record, validation_regex) |
|
|
|