diff options
| author | cedricnjanga | 2018-03-18 21:23:14 -0700 |
|---|---|---|
| committer | cedricnjanga | 2018-03-18 21:23:14 -0700 |
| commit | ab80649830a6d6aa0ffe12c16b3bac60249528f7 (patch) | |
| tree | 8a64c63ffbe208c46c239c0843dbb44e331daefb | |
| parent | c297e8a97f41221c0a6cfd5f3aee89589811d47c (diff) | |
| download | chouette-core-ab80649830a6d6aa0ffe12c16b3bac60249528f7.tar.bz2 | |
Refs #6139 Add format validation on min max values for compliance controls
| -rw-r--r-- | app/models/concerns/min_max_values_validation.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/app/models/concerns/min_max_values_validation.rb b/app/models/concerns/min_max_values_validation.rb index af7174cea..8993099ef 100644 --- a/app/models/concerns/min_max_values_validation.rb +++ b/app/models/concerns/min_max_values_validation.rb @@ -2,19 +2,12 @@ module MinMaxValuesValidation extend ActiveSupport::Concern included do - before_validation :force_min_max_values_to_respect_numeric_format validates_presence_of :minimum, :maximum validates_numericality_of :minimum, :maximum, allow_nil: true, greater_than_or_equal_to: 0 + validates_format_of :minimum, :maximum, with: %r{\A\d+\.\d{2}\Z} validate :min_max_values_validation end - def force_min_max_values_to_respect_numeric_format - if self.minimum && self.maximum - self.minimum = self.minimum.gsub(",", ".") - self.maximum = self.maximum.gsub(",", ".") - end - end - def min_max_values_validation return true if (maximum && maximum) && (minimum.to_f < maximum.to_f) errors.add(:minimum, I18n.t('compliance_controls.min_max_values', min: minimum, max: maximum)) |