diff options
| author | Luc Donnet | 2018-03-23 08:10:29 +0100 |
|---|---|---|
| committer | Luc Donnet | 2018-03-23 08:11:07 +0100 |
| commit | 80562dc41c56d249bd7a0c8843b762937e7ab180 (patch) | |
| tree | ee38afeb141b0088f7fc843c8806ac02a56ef7a0 /app/models | |
| parent | 52e0cc6d5431f17df16b25ac9c391a3515495862 (diff) | |
| download | chouette-core-80562dc41c56d249bd7a0c8843b762937e7ab180.tar.bz2 | |
Fix i18n enhancements on titles @3
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/chouette/line.rb | 2 | ||||
| -rw-r--r-- | app/models/chouette/route.rb | 6 | ||||
| -rw-r--r-- | app/models/vehicle_journey_import.rb | 4 |
3 files changed, 1 insertions, 11 deletions
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb index 2f83fc5bf..ae7c25377 100644 --- a/app/models/chouette/line.rb +++ b/app/models/chouette/line.rb @@ -6,8 +6,6 @@ module Chouette include ObjectidSupport include StifTransportModeEnumerations include StifTransportSubmodeEnumerations - extend ActiveModel::Naming - belongs_to :company belongs_to :network diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb index f814d5160..13288bc6b 100644 --- a/app/models/chouette/route.rb +++ b/app/models/chouette/route.rb @@ -4,9 +4,7 @@ module Chouette include RouteRestrictions include ChecksumSupport include ObjectidSupport - extend Enumerize - extend ActiveModel::Naming enumerize :direction, in: %i(straight_forward backward clockwise counter_clockwise north north_west west south_west south south_east east north_east) enumerize :wayback, in: %i(outbound inbound), default: :outbound @@ -69,10 +67,6 @@ module Chouette validates_presence_of :name validates_presence_of :published_name validates_presence_of :line - - # validates_presence_of :direction - # validates_presence_of :wayback - validates :wayback, inclusion: { in: self.wayback.values } after_save :calculate_costs!, if: ->() { TomTom.enabled? } diff --git a/app/models/vehicle_journey_import.rb b/app/models/vehicle_journey_import.rb index f06b1bfaf..2eb723c29 100644 --- a/app/models/vehicle_journey_import.rb +++ b/app/models/vehicle_journey_import.rb @@ -1,7 +1,5 @@ class VehicleJourneyImport - include ActiveModel::Validations - include ActiveModel::Conversion - extend ActiveModel::Naming + include ActiveModel::Model extend EnhancedModelI18n |