aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2018-01-11 12:23:13 +0100
committerLuc Donnet2018-01-11 12:23:37 +0100
commita9cd4e4c90f90ca68292febbd88d5cdf4c7c109f (patch)
tree787c680276b00a48d69d27aed32c13c18539a4ff
parent1fb70f5250c924d42c474af35184b4496fd4e813 (diff)
downloadchouette-core-a9cd4e4c90f90ca68292febbd88d5cdf4c7c109f.tar.bz2
Fix min max values validation for compliance controls display and test Refs #5543 @1
-rw-r--r--app/models/concerns/min_max_values_validation.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/concerns/min_max_values_validation.rb b/app/models/concerns/min_max_values_validation.rb
index c177e55ca..9b2e0d548 100644
--- a/app/models/concerns/min_max_values_validation.rb
+++ b/app/models/concerns/min_max_values_validation.rb
@@ -6,8 +6,7 @@ module MinMaxValuesValidation
end
def min_max_values_validation
- return true unless minimum && maximum
- return true unless maximum < minimum
- errors.add(:min_max_values, I18n.t('compliance_controls.min_max_values', min: minimum, max: maximum))
+ return true if (minimum && maximum) && (minimum.to_i < maximum.to_i)
+ errors.add(:minimum, I18n.t('compliance_controls.min_max_values', min: minimum, max: maximum))
end
end