diff options
| -rw-r--r-- | app/models/chouette/journey_pattern.rb | 2 | ||||
| -rw-r--r-- | config/locales/journey_patterns.en.yml | 6 | ||||
| -rw-r--r-- | config/locales/journey_patterns.fr.yml | 6 | ||||
| -rw-r--r-- | spec/models/chouette/journey_pattern_spec.rb | 1 |
4 files changed, 14 insertions, 1 deletions
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb index 3c902946d..a146dcff1 100644 --- a/app/models/chouette/journey_pattern.rb +++ b/app/models/chouette/journey_pattern.rb @@ -14,7 +14,7 @@ class Chouette::JourneyPattern < Chouette::TridentActiveRecord validates_presence_of :route validates_presence_of :name - validates :stop_points, length: { minimum: 2 }, on: :update + validates :stop_points, length: { minimum: 2, too_short: :minimum }, on: :update enum section_status: { todo: 0, completed: 1, control: 2 } attr_accessor :control_checked diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml index d62d79e58..80adc2337 100644 --- a/config/locales/journey_patterns.en.yml +++ b/config/locales/journey_patterns.en.yml @@ -24,6 +24,12 @@ en: form: warning: "Be careful, selection is also applied to the %{count} vehicle journeys associated to this journey pattern" activerecord: + errors: + models: + journey_pattern: + attributes: + stop_points: + minimum: 'Must at least have two stop points' models: journey_pattern: zero: "journey pattern" diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml index 39005e464..0dceb2f43 100644 --- a/config/locales/journey_patterns.fr.yml +++ b/config/locales/journey_patterns.fr.yml @@ -24,6 +24,12 @@ fr: form: warning: "Attention, la sélection s'applique aussi aux %{count} courses de la mission" activerecord: + errors: + models: + journey_pattern: + attributes: + stop_points: + minimum: 'Une mission doit avoir au minimum deux arrêts' models: journey_pattern: zero: "mission" diff --git a/spec/models/chouette/journey_pattern_spec.rb b/spec/models/chouette/journey_pattern_spec.rb index f7006efc7..aaf9a694f 100644 --- a/spec/models/chouette/journey_pattern_spec.rb +++ b/spec/models/chouette/journey_pattern_spec.rb @@ -18,6 +18,7 @@ describe Chouette::JourneyPattern, :type => :model do journey_pattern.stop_points.delete(sp) end expect(journey_pattern).to_not be_valid + expect(journey_pattern.errors).to have_key(:stop_points) end end |