diff options
| author | Alban Peignier | 2018-04-03 15:23:22 +0200 |
|---|---|---|
| committer | Alban Peignier | 2018-04-03 15:23:22 +0200 |
| commit | cb28e8fd8a505b31d991fde5672f1c5496b2ec62 (patch) | |
| tree | 3caa9df415bd9803cb85f784cfb89e1f36e32538 | |
| parent | 00c8f6c119637762eaf5e60503d3fbdcb0a4bd5e (diff) | |
| download | chouette-core-cb28e8fd8a505b31d991fde5672f1c5496b2ec62.tar.bz2 | |
Remove hardcoded format on line/stop_area/company registration_numbers (blocks GTFS imports). Refs #6368
| -rw-r--r-- | app/models/chouette/company.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/line.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/stop_area.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/chouette/company.rb b/app/models/chouette/company.rb index 53e412600..f5ed4e0f8 100644 --- a/app/models/chouette/company.rb +++ b/app/models/chouette/company.rb @@ -7,7 +7,7 @@ module Chouette has_many :lines - validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_nil => true, :allow_blank => true + # validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_nil => true, :allow_blank => true validates_presence_of :name validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb index ae7c25377..9f05b611a 100644 --- a/app/models/chouette/line.rb +++ b/app/models/chouette/line.rb @@ -29,7 +29,7 @@ module Chouette # validates_presence_of :network # validates_presence_of :company - validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true + # validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true validates_format_of :stable_id, :with => %r{\A[\d\w_\-]+\Z}, :allow_nil => true, :allow_blank => true validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true validates_format_of :color, :with => %r{\A[0-9a-fA-F]{6}\Z}, :allow_nil => true, :allow_blank => true diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb index ccdff609f..5f2c92acb 100644 --- a/app/models/chouette/stop_area.rb +++ b/app/models/chouette/stop_area.rb @@ -32,7 +32,7 @@ module Chouette after_update :journey_patterns_control_route_sections, if: Proc.new { |stop_area| ['boarding_position', 'quay'].include? stop_area.stop_area_type } - validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_blank => true + # validates_format_of :registration_number, :with => %r{\A[\d\w_:\-]+\Z}, :allow_blank => true validates_presence_of :name validates_presence_of :kind validates_presence_of :latitude, :if => :longitude |