diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index e249372c7..783a55524 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -187,6 +187,7 @@ class ReportsController < ApplicationController page_html_string = render_to_string 'reports/new.html.erb', export_all: true parsed_page_html = Nokogiri::HTML(page_html_string) parsed_pdf_html = parsed_page_html.at_css('#report-content') + @report.destroy filename = "#{@project.name}.pdf" parsed_pdf = render_to_string( @@ -411,7 +412,6 @@ class ReportsController < ApplicationController report.last_modified_by = current_user report.save_with_contents(report_contents) - # TODO: do report.destroy after it is downloaded report end diff --git a/app/models/report.rb b/app/models/report.rb index 0c01fca99..3a927f44a 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -20,7 +20,7 @@ class Report < ApplicationRecord # Report either has many report elements (if grouped by timestamp), # 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 Views::Datatables::DatatablesReport.refresh_materialized_view