diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 3f27c13a55..120c7a689d 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -34,8 +34,6 @@ module Admin else show_report end - rescue Timeout::Error - render_timeout_error end private @@ -64,10 +62,10 @@ module Admin end def background(format) - @blob = ReportBlob.create_for_upload_later!(report_filename) + blob = ReportBlob.create_for_upload_later!(report_filename) ReportJob.perform_later( - report_class, spree_current_user, params, format, @blob, ScopedChannel.for_id(params[:uuid]) + report_class, spree_current_user, params, format, blob, ScopedChannel.for_id(params[:uuid]) ) render cable_ready: cable_car. @@ -79,17 +77,5 @@ module Admin block: "start" ) end - - def render_timeout_error - assign_view_data - if @blob - @error = ".report_taking_longer_html" - @error_url = @blob.expiring_service_url - else - @error = ".report_taking_longer" - @error_url = "" - end - render "show" - end end end