From 3ccd38eaf70078271813c98a8ead64d6cb94230c Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Tue, 16 Jan 2018 15:34:37 +0100
Subject: Finalize CSV export for ComplianceCheckMessage and Import<essage

---
 app/controllers/compliance_check_messages_controller.rb | 2 +-
 app/models/compliance_check_message_export.rb           | 6 +++---
 app/models/import_message_export.rb                     | 2 +-
 app/views/import_resources/index.html.slim              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/controllers/compliance_check_messages_controller.rb b/app/controllers/compliance_check_messages_controller.rb
index 1e4fff6e5..7c416584e 100644
--- a/app/controllers/compliance_check_messages_controller.rb
+++ b/app/controllers/compliance_check_messages_controller.rb
@@ -7,7 +7,7 @@ class ComplianceCheckMessagesController < ChouetteController
   def index
     index! do |format|
       format.csv {
-        send_data ComplianceCheckMessageExport.new(compliance_check_messages: collection).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "compliance_check_set_errors_#{line_code}_#{Time.now.to_i}.csv"
+        send_data ComplianceCheckMessageExport.new(compliance_check_messages: collection).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true, server_url: request.base_url) , :filename => "compliance_check_set_errors_#{line_code}_#{Time.now.to_i}.csv"
       }
     end
   end
diff --git a/app/models/compliance_check_message_export.rb b/app/models/compliance_check_message_export.rb
index b3e3f80cf..04e1a9caa 100644
--- a/app/models/compliance_check_message_export.rb
+++ b/app/models/compliance_check_message_export.rb
@@ -22,14 +22,14 @@ class ComplianceCheckMessageExport
   end
 
   def column_names
-    ["criticity", "message key", "message", "resource objectid"]
+    ["criticity", "message key", "resource objectid", "link", "message"]
   end
 
   def to_csv(options = {})
-    CSV.generate(options) do |csv|
+    CSV.generate(options.slice(:col_sep, :quote_char, :force_quotes)) do |csv|
       csv << column_names
       compliance_check_messages.each do |compliance_check_message|
-        csv << [compliance_check_message.compliance_check.criticity, compliance_check_message.message_attributes[:test_id], I18n.t("compliance_check_messages.#{compliance_check_message.message_key}", compliance_check_message.message_attributes.deep_symbolize_keys), compliance_check_message.resource_attributes[:objectid] ]
+        csv << [compliance_check_message.compliance_check.criticity, *compliance_check_message.message_attributes.values_at('test_id', 'source_objectid'), options[:server_url] + compliance_check_message.message_attributes['source_object_path'], I18n.t("compliance_check_messages.#{compliance_check_message.message_key}", compliance_check_message.message_attributes.deep_symbolize_keys)]
       end
     end
   end
diff --git a/app/models/import_message_export.rb b/app/models/import_message_export.rb
index eeb6ebb18..05f8a2cc7 100644
--- a/app/models/import_message_export.rb
+++ b/app/models/import_message_export.rb
@@ -29,7 +29,7 @@ class ImportMessageExport
     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.compliance_check_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_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")  ]
       end
     end
   end
diff --git a/app/views/import_resources/index.html.slim b/app/views/import_resources/index.html.slim
index 728d9f4a8..0c21a9e09 100644
--- a/app/views/import_resources/index.html.slim
+++ b/app/views/import_resources/index.html.slim
@@ -48,4 +48,4 @@
         - else
           .col-lg-12
             - @import.messages.each do |message|
-              = I18n.t("import_messages.compliance_check_messages.#{message.message_key}")
+              = I18n.t("import_messages.#{message.message_key}")
-- 
cgit v1.2.3