diff options
| author | Luc Donnet | 2018-05-15 12:17:46 +0200 | 
|---|---|---|
| committer | Luc Donnet | 2018-05-15 12:17:46 +0200 | 
| commit | d6211521715039acc58231710d75e6244f9e2907 (patch) | |
| tree | b27ad6234bccb263dd22ec25926ec0f72887f123 /app/controllers | |
| parent | 19865cf74318aa70e3f41506f8134037eeabd750 (diff) | |
| download | chouette-core-d6211521715039acc58231710d75e6244f9e2907.tar.bz2 | |
Fix import separator for dates in import and compliance_check resource filename Refs #6949 @1
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/compliance_check_messages_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/import_messages_controller.rb | 2 | 
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 3c9009959..db551cca5 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 => "#{t('compliance_check_messages.compliance_check_set_errors')}_#{line_code}_#{Time.now.strftime('%d_%m_%Y_%H_%M')}.csv" +        send_data ComplianceCheckMessageExport.new(compliance_check_messages: collection).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true, server_url: request.base_url) , :filename => "#{t('compliance_check_messages.compliance_check_set_errors')}_#{line_code}_#{Time.now.strftime('%d-%m-%Y_%H-%M')}.csv"        }      end    end diff --git a/app/controllers/import_messages_controller.rb b/app/controllers/import_messages_controller.rb index 0f62598bf..9f61940a3 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 Import::MessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "#{t('import_messages.import_errors')}_#{@import_resource.name.gsub('.xml', '')}_#{Time.now.strftime("%d/%m/%Y_%H:%M")}.csv" +        send_data Import::MessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "#{t('import_messages.import_errors')}_#{@import_resource.name.gsub('.xml', '')}_#{Time.now.strftime("%d-%m-%Y_%H-%M")}.csv"        }      end    end | 
