aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2018-05-15 11:17:59 +0200
committerLuc Donnet2018-05-15 11:17:59 +0200
commit7cf366a2d0e43c53d0f0a3e05f5fc63fb57b58b8 (patch)
treed7ade2b678eda4e14fa278622f75ecfe92dfe766
parent737c28add278b56d0e8def940df1118e063380c6 (diff)
downloadchouette-core-7cf366a2d0e43c53d0f0a3e05f5fc63fb57b58b8.tar.bz2
Fix filename for import resource Refs #6950 @16950-import-csv-export-filename
-rw-r--r--app/controllers/import_messages_controller.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/import_messages_controller.rb b/app/controllers/import_messages_controller.rb
index 0c9607449..0f62598bf 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_')}_#{line_code}_#{Date.today.to_s}.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
@@ -23,10 +23,4 @@ class ImportMessagesController < ChouetteController
@import_resource ||= Import::Resource.find(params[:import_resource_id])
end
- private
-
- def line_code
- Chouette::Line.find_by_objectid("#{@import_resource.reference}").get_objectid.local_id
- end
-
end