棚卸用CSV出力、返品CSV、アンケート管理CSV、キャンペーン管理CSV Download可能

diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index 56fed53..b0605ba 100644 (file)
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -143,7 +143,7 @@ class Campaign < ActiveRecord::Base
               "性別",
               "職業"]
 
-    result += header.map.join(",") + "\r\n"
+    result += header.join(",") + "\r\n"
 
     questionnaires = campaign.customers
 

diff --git a/app/models/questionnaire.rb b/app/models/questionnaire.rb
index 8f0bddc..25279e6 100644 (file)
--- a/app/models/questionnaire.rb
+++ b/app/models/questionnaire.rb
@@ -70,8 +70,9 @@ class Questionnaire < ActiveRecord::Base
   def self.csv(id, count)
     questionnaire = self.find(id)
     header = get_csv_header(count)
-    f = StringIO.new('', 'w')
-    CSV::Writer.generate(f) do |writer|
+    #f = StringIO.new('', 'w')
+    #CSV::Writer.generate(f) do |writer|
+    f = CSV.generate("") do |writer|
       writer << header
       questionnaire.questionnaire_answers.each do | questionnaire_answer |
         row = questionnaire_answer.export_row
@@ -81,7 +82,6 @@ class Questionnaire < ActiveRecord::Base
         writer << row
       end
     end
-    f.string
   end
 
   private