diff options
| -rw-r--r-- | app/helpers/exports_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/export/netex.rb | 4 | ||||
| -rw-r--r-- | config/locales/exports.en.yml | 4 | ||||
| -rw-r--r-- | config/locales/exports.fr.yml | 4 | ||||
| -rw-r--r-- | spec/controllers/exports_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/factories/exports/netex_exports.rb | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/app/helpers/exports_helper.rb b/app/helpers/exports_helper.rb index c095419bb..0f322f855 100644 --- a/app/helpers/exports_helper.rb +++ b/app/helpers/exports_helper.rb @@ -18,7 +18,7 @@ module ExportsHelper opts = { required: option_def[:required], input_html: {value: export.try(attr) || option_def[:default_value]}, as: option_def[:type], selected: export.try(attr) || option_def[:default_value]} if option_def.has_key?(:collection) - if option_def[:collection].is_a? Array + if option_def[:collection].is_a?(Array) && !option_def[:collection].first.is_a?(Array) opts[:collection] = option_def[:collection].map{|k| [export.class.tmf("#{type.name.demodulize.underscore}.#{attr}_collection.#{k}"), k]} else opts[:collection] = option_def[:collection] diff --git a/app/models/export/netex.rb b/app/models/export/netex.rb index bacc7e60f..d471682b0 100644 --- a/app/models/export/netex.rb +++ b/app/models/export/netex.rb @@ -1,11 +1,11 @@ class Export::Netex < Export::Base after_commit :call_iev_callback, on: :create - option :export_subtype, collection: %w(line full), required: true do |val| + option :export_type, collection: %w(line full), required: true do |val| val.full do option :duration, type: :integer, default_value: 90, required: true end val.line do - option :line_code, collection: ->(referential){referential.lines}, depends_on_referential: true + option :line_code, collection: ->(referential){referential.lines.map{|l| [l.display_name, l.id]}}, depends_on_referential: true end end diff --git a/config/locales/exports.en.yml b/config/locales/exports.en.yml index c6eb074b4..bc5d7b696 100644 --- a/config/locales/exports.en.yml +++ b/config/locales/exports.en.yml @@ -97,8 +97,8 @@ en: <<: *attrs duration: Duration (in days) line_code: Line - export_subtype: Export subtype - export_subtype_collection: + export_type: Export subtype + export_type_collection: line: By line full: Full workgroup: diff --git a/config/locales/exports.fr.yml b/config/locales/exports.fr.yml index ce31e611f..ca685a92d 100644 --- a/config/locales/exports.fr.yml +++ b/config/locales/exports.fr.yml @@ -97,8 +97,8 @@ fr: <<: *attrs duration: Durée (en jours) line_code: Ligne - export_subtype: Sous-type d'export - export_subtype_collection: + export_type: Sous-type d'export + export_type_collection: line: Par ligne full: Complet workgroup: diff --git a/spec/controllers/exports_controller_spec.rb b/spec/controllers/exports_controller_spec.rb index d4ee5bc18..ae48fc3b8 100644 --- a/spec/controllers/exports_controller_spec.rb +++ b/spec/controllers/exports_controller_spec.rb @@ -29,7 +29,7 @@ RSpec.describe ExportsController, :type => :controller do name: "foo", type: "Export::Netex", duration: 12, - export_subtype: :full, + export_type: :full, referential_id: first_referential.id }} diff --git a/spec/factories/exports/netex_exports.rb b/spec/factories/exports/netex_exports.rb index b7486bcf4..0648bbc56 100644 --- a/spec/factories/exports/netex_exports.rb +++ b/spec/factories/exports/netex_exports.rb @@ -1,7 +1,7 @@ FactoryGirl.define do factory :netex_export, class: Export::Netex, parent: :export do association :parent, factory: :workgroup_export - export_subtype :line + export_type :line duration 90 end end |