From ec28db6f4fb7b7e0472c534ad97a8dedec5df0f7 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Thu, 10 Jan 2019 14:16:09 +0100 Subject: [PATCH] Fix image URLs in export all document [SCI-2931] --- app/assets/stylesheets/reports.scss | 5 +++++ app/assets/stylesheets/themes/scinote.scss | 4 ---- app/helpers/tiny_mce_helper.rb | 10 +++++++++- .../elements/_my_module_result_asset_element.html.erb | 6 +++++- .../elements/_my_module_result_text_element.html.erb | 3 ++- .../reports/elements/_my_module_step_element.html.erb | 3 ++- .../reports/elements/_step_asset_element.html.erb | 6 +++++- 7 files changed, 28 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss index a1efb5700..9752b1f84 100644 --- a/app/assets/stylesheets/reports.scss +++ b/app/assets/stylesheets/reports.scss @@ -206,6 +206,11 @@ label { padding-top: 10px; padding-left: 15px; padding-right: 15px; + + .report-export-img { + max-height: 300px; + max-width: 300px; + } } .report-element-children { diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index d9e5a715c..4eca577ba 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -1945,10 +1945,6 @@ a.disabled-with-click-events { padding-bottom: 60px; } -.tiny-mce-pdf-ready { - max-width: 100%; -} - .doorkeeper-authorization { margin-bottom: 45px; diff --git a/app/helpers/tiny_mce_helper.rb b/app/helpers/tiny_mce_helper.rb index 091c586c1..809a5655d 100644 --- a/app/helpers/tiny_mce_helper.rb +++ b/app/helpers/tiny_mce_helper.rb @@ -26,7 +26,15 @@ module TinyMceHelper img = TinyMceAsset.find_by_id(match[1]) next unless img && check_image_permissions(obj, img) if pdf_export_ready - report_image_asset_url(img, :tiny_mce_asset, 'tiny-mce-pdf-ready') + tmp_f = Tempfile.open(img.image_file_name, Rails.root.join('tmp')) + begin + img.image.copy_to_local_file(:large, tmp_f.path) + encoded_image = Base64.strict_encode64(tmp_f.read) + "" + ensure + tmp_f.close + tmp_f.unlink + end else image_tag(img.url, class: 'img-responsive', diff --git a/app/views/reports/elements/_my_module_result_asset_element.html.erb b/app/views/reports/elements/_my_module_result_asset_element.html.erb index 84f341a44..62cc048c3 100644 --- a/app/views/reports/elements/_my_module_result_asset_element.html.erb +++ b/app/views/reports/elements/_my_module_result_asset_element.html.erb @@ -38,7 +38,11 @@
- <%= report_image_asset_url(asset) %> + <% if defined?(export_all) && export_all %> + + <% else %> + <%= report_image_asset_url(asset) %> + <% 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 69c452a37..9159f7c78 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 @@ -3,6 +3,7 @@ <% comments = result.result_comments %> <% timestamp = result.created_at %> <% name = result.name %> +<% pdf_export_ready = defined?(export_all) && export_all %>
" data-name="<%= name %>" data-icon-class="fas fa-asterisk">
@@ -23,7 +24,7 @@
- <%= custom_auto_link(generate_image_tag_from_token(result_text.text, result_text, true), + <%= custom_auto_link(generate_image_tag_from_token(result_text.text, result_text, pdf_export_ready), team: current_team, simple_format: false, tags: %w(img)) %> diff --git a/app/views/reports/elements/_my_module_step_element.html.erb b/app/views/reports/elements/_my_module_step_element.html.erb index 6490d4c23..b6c602d0c 100644 --- a/app/views/reports/elements/_my_module_step_element.html.erb +++ b/app/views/reports/elements/_my_module_step_element.html.erb @@ -6,6 +6,7 @@ <% assets = step.assets %> <% checklists = step.checklists %> <% comments = step.step_comments %> +<% pdf_export_ready = defined?(export_all) && export_all %>
" data-name="<%=t "projects.reports.elements.step.sidebar_name", pos: (step.position + 1), name: step.name %>" data-icon-class="fas fa-arrow-circle-right">
@@ -30,7 +31,7 @@
<% if strip_tags(step.description).present? %> - <%= custom_auto_link(generate_image_tag_from_token(step.description, step, true), + <%= custom_auto_link(generate_image_tag_from_token(step.description, step, pdf_export_ready), team: current_team, simple_format: false, tags: %w(img)) %> diff --git a/app/views/reports/elements/_step_asset_element.html.erb b/app/views/reports/elements/_step_asset_element.html.erb index fb09808ca..f9bbcde53 100644 --- a/app/views/reports/elements/_step_asset_element.html.erb +++ b/app/views/reports/elements/_step_asset_element.html.erb @@ -32,7 +32,11 @@ <% if is_image %>
- <%= report_image_asset_url(asset) %> + <% if defined?(export_all) && export_all %> + + <% else %> + <%= report_image_asset_url(asset) %> + <% end %>
<% end %>