From 16babf8250295556cf8298d2f9ed7fa57bd0e425 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Fri, 3 Jun 2022 09:29:40 +0200 Subject: [PATCH] Don't modify `params` object, but use an intermediate variable `@params_fields_to_show` --- app/controllers/admin/reports_controller.rb | 8 ++++++-- app/views/admin/reports/_rendering_options.html.haml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index fd01009036..35c9b5891a 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -47,8 +47,12 @@ module Admin # Initialize data params[:display_summary_row] = true if request.get? if OpenFoodNetwork::FeatureToggle.enabled?(:report_inverse_columns_logic, - spree_current_user) && request.get? - params[:fields_to_show] = @report.columns.keys + spree_current_user) + @params_fields_to_show = if request.get? + @report.columns.keys + else + params[:fields_to_show] + end end @data = Reporting::FrontendData.new(spree_current_user) diff --git a/app/views/admin/reports/_rendering_options.html.haml b/app/views/admin/reports/_rendering_options.html.haml index 051e99591b..92cb310b44 100644 --- a/app/views/admin/reports/_rendering_options.html.haml +++ b/app/views/admin/reports/_rendering_options.html.haml @@ -26,7 +26,7 @@ - if feature? :report_inverse_columns_logic, spree_current_user .alpha.two.columns= label_tag nil, t(:report_columns) .omega.fourteen.columns - = select_tag(:fields_to_show, options_for_select(@report.available_headers, params[:fields_to_show]), + = select_tag(:fields_to_show, options_for_select(@report.available_headers, @params_fields_to_show), class: "select2 fullwidth", multiple: true) - else .alpha.two.columns= label_tag nil, t(:report_hide_columns)