From 6824f9a8bc28aca75a0c749fab0f76a39b6bb947 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 2 Oct 2017 11:29:22 +0200 Subject: [PATCH] Improve memory utulization in PDF report generator [SCI-1482] --- app/controllers/reports_controller.rb | 3 ++- app/views/reports/report.pdf.erb | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 524123e90..7a544e972 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -182,7 +182,8 @@ class ReportsController < ApplicationController @html = '

No content

' if @html.blank? render pdf: 'report', header: { right: '[page] of [topage]' }, - template: 'reports/report.pdf.erb' + template: 'reports/report.pdf.erb', + disable_javascript: true end end end diff --git a/app/views/reports/report.pdf.erb b/app/views/reports/report.pdf.erb index aaa96c774..6e96f962d 100644 --- a/app/views/reports/report.pdf.erb +++ b/app/views/reports/report.pdf.erb @@ -10,9 +10,7 @@
<% # Also whitelist and tags %> - <%= sanitize_input(fix_smart_annotation_image(@html), - ['img', 'input'], - ['type', 'disabled', 'checked']) %> + <%= @html.html_safe %>