diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/exports_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/export/netex.rb | 4 |
2 files changed, 3 insertions, 3 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 |