scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-19 22:11:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixes pdf export and image size [fixes SCI-1247]

Browse source
This commit is contained in:
zmagod 2017-05-09 13:59:59 +02:00
parent ccc640f2bc
commit 2d69896897
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/tiny_mce_helper.rb
View file

@ -23,7 +23,9 @@ module TinyMceHelper
match = el.match(regex) match = el.match(regex)
img = TinyMceAsset.find_by_id(match[1]) img = TinyMceAsset.find_by_id(match[1])
next unless img next unless img
image_tag img.url, data: { token: Base62.encode(img.id) } image_tag img.url,
class: 'img-responsive',
data: { token: Base62.encode(img.id) }
end end
end end

4
app/models/tiny_mce_asset.rb
View file

@ -25,7 +25,7 @@ class TinyMceAsset < ActiveRecord::Base
# When using S3 file upload, we can limit file accessibility with url signing # When using S3 file upload, we can limit file accessibility with url signing
def presigned_url(style = :large, def presigned_url(style = :large,
download: false, download: false,
timeout: Constants::URL_SHORT_EXPIRE_TIME) timeout: Constants::URL_LONG_EXPIRE_TIME)
if stored_on_s3? if stored_on_s3?
if download if download
download_arg = 'attachment; filename=' + URI.escape(image_file_name) download_arg = 'attachment; filename=' + URI.escape(image_file_name)
@ -46,7 +46,7 @@ class TinyMceAsset < ActiveRecord::Base
image.options[:storage].to_sym == :s3 image.options[:storage].to_sym == :s3
end end
def url(style = :large, timeout: Constants::URL_SHORT_EXPIRE_TIME) def url(style = :large, timeout: Constants::URL_LONG_EXPIRE_TIME)
if image.is_stored_on_s3? if image.is_stored_on_s3?
presigned_url(style, timeout: timeout) presigned_url(style, timeout: timeout)
else else