diff options
| author | Robert | 2017-06-28 18:29:30 +0200 |
|---|---|---|
| committer | Robert | 2017-06-28 18:29:30 +0200 |
| commit | 37d22d0851a4b03e1036fdd3c098273c26ae1d15 (patch) | |
| tree | 3de00fc3b066e26bb15ffc895dbaebc5f650cd6c | |
| parent | b260c832c8e129dbeacfe065d01bd0732dd80701 (diff) | |
| download | chouette-core-37d22d0851a4b03e1036fdd3c098273c26ae1d15.tar.bz2 | |
Fixes: #3873@1h
| -rw-r--r-- | app/models/referential_metadata.rb | 4 | ||||
| -rw-r--r-- | app/views/access_link_pairs/_access_link_pair.html.slim | 1 | ||||
| -rw-r--r-- | config/locales/referentials.fr.yml | 1 | ||||
| -rw-r--r-- | spec/models/referential_metadata_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/models/referential_metadata.rb b/app/models/referential_metadata.rb index 357465c63..b774072c7 100644 --- a/app/models/referential_metadata.rb +++ b/app/models/referential_metadata.rb @@ -44,8 +44,8 @@ class ReferentialMetadata < ActiveRecord::Base validate :check_end_greather_than_begin def check_end_greather_than_begin - if self.begin and self.end and self.begin > self.end - errors.add(:end, :invalid) + if self.begin and self.end and self.begin >= self.end + errors.add(:base, I18n.t('referentials.errors.short_period')) end end diff --git a/app/views/access_link_pairs/_access_link_pair.html.slim b/app/views/access_link_pairs/_access_link_pair.html.slim index 3eebfd7f6..c313f9044 100644 --- a/app/views/access_link_pairs/_access_link_pair.html.slim +++ b/app/views/access_link_pairs/_access_link_pair.html.slim @@ -1,5 +1,4 @@ tr - - require 'pry'; binding.pry td .link .access_point diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml index b9e337503..f69c26276 100644 --- a/config/locales/referentials.fr.yml +++ b/config/locales/referentials.fr.yml @@ -41,6 +41,7 @@ fr: user_excluded: "%{user} est une valeur réservée" overlapped_referential: "%{referential} couvre le même périmètre d'offre" overlapped_period: "Une autre période chevauche cette période" + short_period: La durée minimum d'une période est de deux jours activerecord: models: referential: diff --git a/spec/models/referential_metadata_spec.rb b/spec/models/referential_metadata_spec.rb index 0f628c8d1..91a2a7fc2 100644 --- a/spec/models/referential_metadata_spec.rb +++ b/spec/models/referential_metadata_spec.rb @@ -87,7 +87,7 @@ RSpec.describe ReferentialMetadata, :type => :model do it "should validate that end is greather than or equlals to begin" do expect(period(begin: "2016-11-21", end: "2016-11-22")).to be_valid - expect(period(begin: "2016-11-21", end: "2016-11-21")).to be_valid + expect(period(begin: "2016-11-21", end: "2016-11-21")).to_not be_valid expect(period(begin: "2016-11-22", end: "2016-11-21")).to_not be_valid end |