aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2018-03-15 09:02:07 +0100
committerLuc Donnet2018-03-15 09:02:07 +0100
commitff1c38086264ed301a2338c3b12f7d69eb4096d9 (patch)
tree58e3ca7be7893744728b587882ce2441b7516c22
parentb6a7c5920741e24b2f2a9546698fcb6912384e8b (diff)
downloadchouette-core-ff1c38086264ed301a2338c3b12f7d69eb4096d9.tar.bz2
Fix netex import key message in csv export Refs #5873 @1
-rw-r--r--app/models/import/message_export.rb2
-rw-r--r--app/models/import/resource.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/import/message_export.rb b/app/models/import/message_export.rb
index 27c540307..7a7add08c 100644
--- a/app/models/import/message_export.rb
+++ b/app/models/import/message_export.rb
@@ -29,7 +29,7 @@ class Import::MessageExport
csv_string = CSV.generate(options) do |csv|
csv << column_names
import_messages.each do |import_message|
- csv << [import_message.criticity, import_message.message_key, I18n.t("import_messages.#{import_message.message_key}", import_message.message_attributes.deep_symbolize_keys), *import_message.resource_attributes.values_at("filename", "line_number", "column_number") ]
+ csv << [import_message.criticity, import_message.message_attributes['test_id'], I18n.t("import_messages.#{import_message.message_key}", import_message.message_attributes.deep_symbolize_keys), *import_message.resource_attributes.values_at("filename", "line_number", "column_number") ]
end
end
# We add a BOM to indicate we use UTF-8
diff --git a/app/models/import/resource.rb b/app/models/import/resource.rb
index 73be04d0e..5bd011039 100644
--- a/app/models/import/resource.rb
+++ b/app/models/import/resource.rb
@@ -4,5 +4,5 @@ class Import::Resource < ActiveRecord::Base
include IevInterfaces::Resource
belongs_to :import, class_name: Import::Base
- has_many :messages, class_name: "ImportMessage", foreign_key: :resource_id
+ has_many :messages, class_name: "Import::Message", foreign_key: :resource_id
end