scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 19:51:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1760 from okriuchykhin/ok_SCI_3381_v2

Browse source 
Fix processing_image_url for S3 storage [SCI-3381]
This commit is contained in:
Alex Kriuchykhin 2019-05-14 13:15:28 +02:00 committed by GitHub
commit 70c4094323
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/asset.rb
View file

@ -320,7 +320,7 @@ class Asset < ApplicationRecord
end
def url(style = :original, timeout: Constants::URL_SHORT_EXPIRE_TIME)
if file.is_stored_on_s3?
if file.is_stored_on_s3? && !file.processing?
presigned_url(style, timeout: timeout)
else
file.url(style)