diff --git a/app/jobs/reports/pdf_job.rb b/app/jobs/reports/pdf_job.rb index 0194d14c5..1ac596e52 100644 --- a/app/jobs/reports/pdf_job.rb +++ b/app/jobs/reports/pdf_job.rb @@ -60,10 +60,10 @@ module Reports file << renderer.render( pdf: 'report', header: { html: { template: "reports/templates/#{template}/header", - locals: { report: report, user: user }, + locals: { report: report, user: user, logo: report_logo }, layout: 'reports/footer_header.html.erb' } }, footer: { html: { template: "reports/templates/#{template}/footer", - locals: { report: report, user: user }, + locals: { report: report, user: user, logo: report_logo }, layout: 'reports/footer_header.html.erb' } }, assigns: { settings: report.settings }, locals: { report: report }, @@ -164,7 +164,7 @@ module Reports title_page << renderer.render( pdf: 'report', inline: renderer.render_to_string("reports/templates/#{template}/cover.html.erb", layout: false, - locals: { report: report, total_pages: total_pages.to_i }), + locals: { report: report, total_pages: total_pages.to_i, logo: report_logo }), disable_javascript: false, template: 'reports/report.pdf.erb' ) @@ -182,5 +182,10 @@ module Reports merged_file end + + def report_logo + 'logo.png' + end + end end diff --git a/app/views/reports/templates/scinote_template/header.html.erb b/app/views/reports/templates/scinote_template/header.html.erb index 5e9a590a6..5311251fa 100644 --- a/app/views/reports/templates/scinote_template/header.html.erb +++ b/app/views/reports/templates/scinote_template/header.html.erb @@ -21,7 +21,7 @@