scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-22 14:54:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3697 from artoscinote/ma_SCI_6300

Browse source 
Don't include PDF files in PDF reports if no permission [SCI-6300]
This commit is contained in:
Miha Mencin 2021-11-24 11:08:44 +01:00 committed by GitHub
commit aff369d852
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/jobs/reports/pdf_job.rb
View file

@ -5,6 +5,7 @@ module Reports
extend InputSanitizeHelper extend InputSanitizeHelper
include InputSanitizeHelper include InputSanitizeHelper
include ReportsHelper include ReportsHelper
include Canaid::Helpers::PermissionsHelper
PDFUNITE_ENCRYPTED_PDF_ERROR_STRING = 'Unimplemented Feature: Could not merge encrypted files' PDFUNITE_ENCRYPTED_PDF_ERROR_STRING = 'Unimplemented Feature: Could not merge encrypted files'
@ -75,7 +76,7 @@ module Reports
file = prepend_title_page(file, template, report, renderer) file = prepend_title_page(file, template, report, renderer)
file = append_result_asset_previews(report, file) if report.settings.dig(:task, :file_results_previews) file = append_result_asset_previews(report, file, user) if report.settings.dig(:task, :file_results_previews)
report.pdf_file.attach(io: file, filename: 'report.pdf') report.pdf_file.attach(io: file, filename: 'report.pdf')
report.pdf_ready! report.pdf_ready!
@ -98,9 +99,11 @@ module Reports
private private
def append_result_asset_previews(report, report_file) def append_result_asset_previews(report, report_file, user)
Dir.mktmpdir do |tmp_dir| Dir.mktmpdir do |tmp_dir|
report.report_elements.my_module.each do |my_module_element| report.report_elements.my_module.each do |my_module_element|
next unless can_read_my_module?(user, my_module_element.my_module)
results = my_module_element.my_module.results results = my_module_element.my_module.results
order_results_for_report(results, report.settings.dig(:task, :result_order)).each do |result| order_results_for_report(results, report.settings.dig(:task, :result_order)).each do |result|
next unless result.is_asset && PREVIEW_EXTENSIONS.include?(result.asset.file.blob.filename.extension) next unless result.is_asset && PREVIEW_EXTENSIONS.include?(result.asset.file.blob.filename.extension)