refs #1587 TSVダウンロード: ダウンロード処理に失敗していたので修正

diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 79d8821..b7d7052 100644 (file)
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -30,15 +30,6 @@ class Admin::BaseController < ApplicationController
     @record.save
   end
 
-  def send_csv(text, filename)
-    send_data(
-      text,
-      type: "application/octet-stream; name=#{filename}; charset=shift_jis; header=present",
-      disposition: 'attachment',
-      filename: filename
-    )
-  end
-
   private
 
   def get_model(model_name = nil)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index cac9d0d..fbf05f5 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -43,6 +43,14 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def send_csv(text, filename)
+    send_data(
+      text,
+      type: "application/octet-stream; name=#{filename}; charset=shift_jis; header=present",
+      disposition: 'attachment',
+      filename: filename
+    )
+  end
   private
   #sslの有効無効をuse_sslで決定する
   def ensure_proper_protocol