aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/import_messages_controller.rb2
-rw-r--r--app/models/import_message_export.rb12
2 files changed, 1 insertions, 13 deletions
diff --git a/app/controllers/import_messages_controller.rb b/app/controllers/import_messages_controller.rb
index 64eec92dd..4ad398cbb 100644
--- a/app/controllers/import_messages_controller.rb
+++ b/app/controllers/import_messages_controller.rb
@@ -9,7 +9,7 @@ class ImportMessagesController < BreadcrumbController
def index
index! do |format|
format.csv {
- send_data ImportMessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => ";") , :filename => "test.csv"
+ send_data ImportMessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => ";") , :filename => "#{File.basename(@import_resource.name)}_#{Time.now.to_i}.csv"
}
end
end
diff --git a/app/models/import_message_export.rb b/app/models/import_message_export.rb
index d36c7984d..39d8f9bca 100644
--- a/app/models/import_message_export.rb
+++ b/app/models/import_message_export.rb
@@ -25,22 +25,10 @@ class ImportMessageExport
["criticity", "message key", "message"]
end
-
- # t.integer "criticity"
- # t.string "message_key"
- # t.hstore "message_attributes"
- # t.integer "import_id", limit: 8
- # t.integer "resource_id", limit: 8
- # t.datetime "created_at"
- # t.datetime "updated_at"
- # t.hstore "resource_attributes"
def to_csv(options = {})
CSV.generate(options) do |csv|
csv << column_names
import_messages.each do |import_message|
- puts import_message.inspect
- puts import_message.message_attributes.deep_symbolize_keys.inspect
- puts I18n.t("import_messages.#{import_message.message_key}", import_message.message_attributes.deep_symbolize_keys)
csv << [import_message.criticity, import_message.message_key, I18n.t("import_messages.#{import_message.message_key}", import_message.message_attributes.deep_symbolize_keys) ]
end
end