diff options
Diffstat (limited to 'app')
| -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 | ||||
| -rw-r--r-- | app/views/vehicle_journey_imports/new.html.slim | 6 |
4 files changed, 3 insertions, 15 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 diff --git a/app/views/vehicle_journey_imports/new.html.slim b/app/views/vehicle_journey_imports/new.html.slim index 6220de273..923fd8b7f 100644 --- a/app/views/vehicle_journey_imports/new.html.slim +++ b/app/views/vehicle_journey_imports/new.html.slim @@ -1,11 +1,9 @@ -= title_tag t('vehicle_journey_imports.new.title') - .main_actions = semantic_form_for [@referential, @line, @route, @vehicle_journey_import] do |form| = form.inputs do = form.input :file, as: :file, input_html: { title: "#{t('.tooltip.file')}", 'data-placement': "right", 'data-toggle': "tooltip", 'data-trigger': "hover" } - + = form.actions do = form.action :submit, as: :button , label: t('formtastic.import') - = form.action :cancel, as: :link
\ No newline at end of file + = form.action :cancel, as: :link |
