diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 715cf1ee5..128b56f70 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -2207,3 +2207,7 @@ th.custom-field .modal-tooltiptext { .linkedin-signin-button { margin: 15px 0; } + +.tiny-mce-pdf-ready { + max-width: 100%; +} diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb index dce65ba6a..a40183a45 100644 --- a/app/helpers/reports_helper.rb +++ b/app/helpers/reports_helper.rb @@ -56,7 +56,7 @@ module ReportsHelper end # "Hack" to omit file preview URL because of WKHTML issues - def report_image_asset_url(asset) + def report_image_asset_url(asset, type = :asset, klass = nil) prefix = '' if ENV['PAPERCLIP_STORAGE'].present? && ENV['MAIL_SERVER_URL'].present? && @@ -68,8 +68,9 @@ module ReportsHelper !prefix.include?('https://') prefix = "http://#{prefix}" end - url = prefix + asset.url(:medium, timeout: Constants::URL_LONG_EXPIRE_TIME) - image_tag(url) + size = type == :tiny_mce_asset ? :large : :medium + url = prefix + asset.url(size, timeout: Constants::URL_LONG_EXPIRE_TIME) + image_tag(url, class: klass) end # "Hack" to load Glyphicons css directly from the CDN diff --git a/app/helpers/tiny_mce_helper.rb b/app/helpers/tiny_mce_helper.rb index 4abb19afe..90ae67c64 100644 --- a/app/helpers/tiny_mce_helper.rb +++ b/app/helpers/tiny_mce_helper.rb @@ -17,7 +17,8 @@ module TinyMceHelper html end - def generate_image_tag_from_token(text, obj) + # @param pdf_export_ready is needed for wicked_pdf in export report action + def generate_image_tag_from_token(text, obj, pdf_export_ready = false) return unless text regex = Constants::TINY_MCE_ASSET_REGEX text.gsub(regex) do |el| @@ -25,9 +26,13 @@ module TinyMceHelper img = TinyMceAsset.find_by_id(match[1]) next unless img && img.team == current_team next unless check_image_permissions(obj, img) - image_tag img.url, - class: 'img-responsive', - data: { token: Base62.encode(img.id) } + if pdf_export_ready + report_image_asset_url(img, :tiny_mce_asset, 'tiny-mce-pdf-ready') + else + image_tag img.url, + class: 'img-responsive', + data: { token: Base62.encode(img.id) } + end end end diff --git a/app/views/reports/elements/_my_module_result_text_element.html.erb b/app/views/reports/elements/_my_module_result_text_element.html.erb index 4a748d30b..63b2d27ff 100644 --- a/app/views/reports/elements/_my_module_result_text_element.html.erb +++ b/app/views/reports/elements/_my_module_result_text_element.html.erb @@ -23,7 +23,7 @@