From 7b99a1a5c5f85a8adf74c9430f05cd2bfedd8307 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 16 Aug 2019 15:55:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B7=BB=E5=8A=A0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84pdf=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb                   |  7 +------
 app/models/attachment.rb                              | 11 +++++++++++
 .../_attachment_history.json.jbuilder                 |  1 +
 app/views/attachments/_attachment_small.json.jbuilder |  3 ++-
 app/views/files/histories.json.jbuilder               |  2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index bcfed25dd..2cfa61cc9 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -260,12 +260,7 @@ class FilesController < ApplicationController
 
     return normal_status(-2, "该课程下没有id为 #{params[:id]}的资源") if @file.nil?
     return normal_status(403, "您没有权限进行该操作") if @user != @file.author && !@user.teacher_of_course?(@course) && !@file.public?
-    @is_pdf = false
-    file_content_type = @file.content_type
-    file_ext_type = File.extname(@file.filename).strip.downcase[1..-1]
-    if (file_content_type.present? && file_content_type.downcase.include?("pdf")) || (file_ext_type.present? && file_ext_type.include?("pdf"))
-      @is_pdf = true
-    end
+
     @attachment_histories = @file.attachment_histories
   end
 
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index bdd749108..3a512278a 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -115,4 +115,15 @@ class Attachment < ApplicationRecord
     end
   end
 
+  #判断是否为pdf文件
+  def is_pdf?
+    is_pdf = false
+    file_content_type = content_type
+    file_ext_type = File.extname(filename).strip.downcase[1..-1]
+    if (file_content_type.present? && file_content_type.downcase.include?("pdf")) || (file_ext_type.present? && file_ext_type.include?("pdf"))
+      is_pdf = true
+    end
+    is_pdf
+  end
+
 end
diff --git a/app/views/attachment_histories/_attachment_history.json.jbuilder b/app/views/attachment_histories/_attachment_history.json.jbuilder
index 37b8b95c1..65ca1e887 100644
--- a/app/views/attachment_histories/_attachment_history.json.jbuilder
+++ b/app/views/attachment_histories/_attachment_history.json.jbuilder
@@ -7,3 +7,4 @@ json.quotes attachment.quotes_count
 json.downloads_count attachment.downloads_count
 json.created_on attachment.created_on
 json.url attachment_path(attachment, type: 'history')
+json.is_pdf attachment.is_pdf?
diff --git a/app/views/attachments/_attachment_small.json.jbuilder b/app/views/attachments/_attachment_small.json.jbuilder
index d9a976bde..97cbee120 100644
--- a/app/views/attachments/_attachment_small.json.jbuilder
+++ b/app/views/attachments/_attachment_small.json.jbuilder
@@ -2,4 +2,5 @@ json.id attachment.id
 json.title attachment.title
 json.filesize number_to_human_size(attachment.filesize)
 json.url download_url(attachment)
-json.created_on attachment.created_on
\ No newline at end of file
+json.created_on attachment.created_on
+json.is_pdf attachment.is_pdf?
\ No newline at end of file
diff --git a/app/views/files/histories.json.jbuilder b/app/views/files/histories.json.jbuilder
index 9dfec4fd4..7039752e7 100644
--- a/app/views/files/histories.json.jbuilder
+++ b/app/views/files/histories.json.jbuilder
@@ -1,3 +1,3 @@
-json.is_pdf @is_pdf
+
 json.partial! 'attachments/attachment_small', attachment: @file
 json.partial! "attachment_histories/list", attachment_histories: @attachment_histories