scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3299 from okriuchykhin/ok_SCI_5553

Browse source 
Add link to generated report preview in notifications [SCI-5553]
This commit is contained in:
Alex Kriuchykhin 2021-05-07 18:30:16 +02:00 committed by GitHub
parent ac97f38247 f5eea49116
commit b829921405
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/jobs/reports/docx_job.rb
View file

@ -22,7 +22,8 @@ module Reports
docx.save docx.save
report.docx_file.attach(io: file, filename: 'report.docx') report.docx_file.attach(io: file, filename: 'report.docx')
report.update!(docx_file_processing: false) report.update!(docx_file_processing: false)
report_path = Rails.application.routes.url_helpers.reports_path report_path = Rails.application.routes.url_helpers
.reports_path(team: report.team.id, preview_report_id: report.id, preview_type: :docx)
notification = Notification.create( notification = Notification.create(
type_of: :deliver, type_of: :deliver,
title: I18n.t('projects.reports.index.generation.completed_docx_notification_title'), title: I18n.t('projects.reports.index.generation.completed_docx_notification_title'),

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

@ -53,7 +53,8 @@ module Reports
report.pdf_file.attach(io: file, filename: 'report.pdf') report.pdf_file.attach(io: file, filename: 'report.pdf')
report.update!(pdf_file_processing: false) report.update!(pdf_file_processing: false)
report_path = Rails.application.routes.url_helpers.reports_path report_path = Rails.application.routes.url_helpers
.reports_path(team: report.team.id, preview_report_id: report.id, preview_type: :pdf)
notification = Notification.create( notification = Notification.create(
type_of: :deliver, type_of: :deliver,
title: I18n.t('projects.reports.index.generation.completed_pdf_notification_title'), title: I18n.t('projects.reports.index.generation.completed_pdf_notification_title'),