scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 20:05:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/1.30.0' into develop

Browse source
This commit is contained in:
Martin Artnik 2024-03-26 14:23:21 +01:00
commit 2aaf94051c
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/scinote_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

4
app/services/reports/docx/private_methods.rb
View file

@ -30,9 +30,9 @@ module Reports::Docx::PrivateMethods
end end
def insert_logo def insert_logo
logo_data = File.read(Rails.root.join('app/assets/images/scinote_logo.svg')) logo_data = File.read(Rails.root.join('app/assets/images/scinote_logo.png'))
@docx.img 'logo.svg' do @docx.img 'logo.png' do
data logo_data data logo_data
height 20 height 20
width 100 width 100

3
app/services/reports/html_to_word_converter.rb
View file

@ -128,7 +128,8 @@ module Reports
image = TinyMceAsset.find_by(id: Base62.decode(elem.attributes['data-mce-token'].value)) image = TinyMceAsset.find_by(id: Base62.decode(elem.attributes['data-mce-token'].value))
return unless image return unless image
image_path = Reports::Utils.image_prepare(image).url image_path = Reports::Utils.image_prepare(image).processed.url
dimension = FastImage.size(image_path) dimension = FastImage.size(image_path)
return unless dimension return unless dimension

6
app/services/reports/utils.rb
View file

@ -11,12 +11,12 @@ module Reports
def self.image_prepare(asset) def self.image_prepare(asset)
if asset.class == Asset if asset.class == Asset
if asset.inline? if asset.inline?
asset.large_preview asset.preview_attachment.representation(resize_to_limit: Constants::MEDIUM_PIC_FORMAT, format: :png)
else else
asset.medium_preview asset.preview_attachment.representation(resize_to_limit: Constants::LARGE_PIC_FORMAT, format: :png)
end end
elsif asset.class == TinyMceAsset elsif asset.class == TinyMceAsset
asset.image asset.image.representation(format: :png)
end end
end end