Browse Source

Add Attachment Video

tags/v1.0.0
sylor_huang@126.com 5 years ago
parent
commit
e698efb14f
2 changed files with 2 additions and 1 deletions
  1. +1
    -1
      app/controllers/application_controller.rb
  2. +1
    -0
      app/views/attachments/_attachment_simple.json.jbuilder

+ 1
- 1
app/controllers/application_controller.rb View File

@@ -385,7 +385,7 @@ class ApplicationController < ActionController::Base

def current_user
if Rails.env.development?
User.current = User.find 36480
User.current = User.find 1
else
User.current
end


+ 1
- 0
app/views/attachments/_attachment_simple.json.jbuilder View File

@@ -3,6 +3,7 @@ json.title attachment.title
json.filesize number_to_human_size attachment.filesize
json.description attachment.description
json.is_pdf attachment.is_pdf?
json.absolute_path absolute_path(local_path(attachment))
json.url attachment.is_pdf? ? download_url(attachment,disposition:"inline") : download_url(attachment)
# json.url download_url(attachment)
json.set! :delete, delete.nil? ? true : delete if defined? delete

Loading…
Cancel
Save