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

Remove dynamically created export all report after it's no longer needed

Browse source
This commit is contained in:
Matej Zrimšek 2018-09-16 20:05:13 +02:00
parent 476b6d50a2
commit 5ce94b5ecd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/reports_controller.rb
View file

@ -187,6 +187,7 @@ class ReportsController < ApplicationController
page_html_string = render_to_string 'reports/new.html.erb', export_all: true page_html_string = render_to_string 'reports/new.html.erb', export_all: true
parsed_page_html = Nokogiri::HTML(page_html_string) parsed_page_html = Nokogiri::HTML(page_html_string)
parsed_pdf_html = parsed_page_html.at_css('#report-content') parsed_pdf_html = parsed_page_html.at_css('#report-content')
@report.destroy
filename = "#{@project.name}.pdf" filename = "#{@project.name}.pdf"
parsed_pdf = render_to_string( parsed_pdf = render_to_string(
@ -411,7 +412,6 @@ class ReportsController < ApplicationController
report.last_modified_by = current_user report.last_modified_by = current_user
report.save_with_contents(report_contents) report.save_with_contents(report_contents)
# TODO: do report.destroy after it is downloaded
report report
end end

2
app/models/report.rb
View file

@ -20,7 +20,7 @@ class Report < ApplicationRecord
# Report either has many report elements (if grouped by timestamp), # Report either has many report elements (if grouped by timestamp),
# or many module elements (if grouped by module) # or many module elements (if grouped by module)
has_many :report_elements, inverse_of: :report, dependent: :destroy has_many :report_elements, inverse_of: :report, dependent: :delete_all
after_commit do after_commit do
Views::Datatables::DatatablesReport.refresh_materialized_view Views::Datatables::DatatablesReport.refresh_materialized_view