aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2018-02-27 14:50:30 +0100
committerGitHub2018-02-27 14:50:30 +0100
commitccbb8172d1e2463890d4138dae307e5526393cee (patch)
tree7daf49c4366e1948af84450ec8ce38c051c88184
parent9c91d8ac61f7a4af3be08fa49d4e52bd3bd8498e (diff)
parent80261043769dbf27fbfb0ccc82e327381f8bf88d (diff)
downloadchouette-core-ccbb8172d1e2463890d4138dae307e5526393cee.tar.bz2
Merge pull request #321 from af83/5979_change_export_csv_filenames
Refs #5979 Change export CSV filenames to have a readable date in it
-rw-r--r--app/controllers/compliance_check_messages_controller.rb2
-rw-r--r--app/controllers/import_messages_controller.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/compliance_check_messages_controller.rb b/app/controllers/compliance_check_messages_controller.rb
index 7c416584e..36745981e 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, server_url: request.base_url) , :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}_#{Date.today.to_s}.csv"
}
end
end
diff --git a/app/controllers/import_messages_controller.rb b/app/controllers/import_messages_controller.rb
index 286bb0ce8..4f8fe7a25 100644
--- a/app/controllers/import_messages_controller.rb
+++ b/app/controllers/import_messages_controller.rb
@@ -9,7 +9,7 @@ class ImportMessagesController < ChouetteController
def index
index! do |format|
format.csv {
- send_data ImportMessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "import_errors_#{@import_resource.name.gsub('.xml', '')}_#{Time.now.to_i}.csv"
+ send_data ImportMessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "import_errors_#{@import_resource.name.gsub('.xml', '')}_#{Date.today.to_s}.csv"
}
end
end