Merge pull request #6 from j-omine/master

バージョンアップの不具合修正
mikosu3 · Dec 8, 2018 · 58dbf58 · 58dbf58
2 parents d3b30f3 + a50fa83
commit 58dbf58
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb
@@ -90,8 +90,7 @@ def destroy_all
   # zipファイルDL
   def zip
     dl_file = Video.create_dl_zip(@video.id)
-    stat = File::stat(dl_file)
-    send_file(dl_file, :filename => ERB::Util.url_encode(@video.name)+ '_' + Time.now.strftime('%Y%m%d%H%M%S') + '.zip', :length => stat.size)
+    send_file(dl_file, type: 'application/zip', :filename => ERB::Util.url_encode(@video.name)+ '_' + Time.now.strftime('%Y%m%d%H%M%S') + '.zip')
   end
 
   private

diff --git a/app/models/video.rb b/app/models/video.rb
@@ -291,6 +291,8 @@ def self.get_dl_video_info(id)
                 model_name
                 ,disp_name
                 ,distribution
+                ,extension
+                ,status
             ORDER BY
                 extension ASC
                 ,model_name ASC;

diff --git a/app/views/videos/index.html.slim b/app/views/videos/index.html.slim
@@ -48,7 +48,7 @@
           td.text-right
             = video.yets
           td
-            = link_to  zip_video_path(video), class: "btn btn-default btn-sm" do
+            = link_to  zip_video_path(video), class: "btn btn-default btn-sm", data: { turbolinks: false } do
               i.glyphicon.glyphicon-download-alt
               |  ダウンロード
 = paginate(@videos)