From aed78f3138a52b4f6d862410d83b46482f5d01c2 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 9 Aug 2024 16:12:04 +1000 Subject: [PATCH] Simplify reports controller code branching --- app/controllers/admin/reports_controller.rb | 5 +++-- app/controllers/concerns/reports_actions.rb | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 7027ea4746..2f71340939 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -21,14 +21,15 @@ module Admin def show @report = report_class.new(spree_current_user, params, render: false) - @rendering_options = rendering_options # also stores user preferences + @rendering_options = rendering_options show_report end def create @report = report_class.new(spree_current_user, params, render: true) - @rendering_options = rendering_options # also stores user preferences + @rendering_options = rendering_options + update_rendering_options render_in_background end diff --git a/app/controllers/concerns/reports_actions.rb b/app/controllers/concerns/reports_actions.rb index b19d6be9e9..53d5b264bc 100644 --- a/app/controllers/concerns/reports_actions.rb +++ b/app/controllers/concerns/reports_actions.rb @@ -88,13 +88,9 @@ module ReportsActions display_header_row: false } end - update_rendering_options - @rendering_options end def update_rendering_options - return unless request.post? - @rendering_options.update( options: { fields_to_show: params[:fields_to_show],