From edc667a3362d5c322e59a072dd3d543c5900cb47 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Thu, 20 Oct 2022 14:46:07 +0200 Subject: [PATCH] By default, some columns are hidden. --- app/controllers/admin/reports_controller.rb | 2 +- spec/controllers/admin/reports_controller_spec.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 01e6757347..7f00bb32a4 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -47,7 +47,7 @@ module Admin # Initialize data params[:display_summary_row] = true if request.get? @params_fields_to_show = if request.get? - @report.columns.keys + @report.columns.keys - @report.fields_to_hide else params[:fields_to_show] end diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb index c367c33712..0fcd50a369 100644 --- a/spec/controllers/admin/reports_controller_spec.rb +++ b/spec/controllers/admin/reports_controller_spec.rb @@ -251,6 +251,7 @@ describe Admin::ReportsController, type: :controller do allow(report).to receive(:table_headers).and_return [] allow(report).to receive(:table_rows).and_return [] allow(report).to receive(:columns).and_return({}) + allow(report).to receive(:fields_to_hide).and_return([]) spree_get :show, report_type: :products_and_inventory, test: "foo" expect(assigns(:report)).to eq(report) end @@ -302,6 +303,7 @@ describe Admin::ReportsController, type: :controller do allow(report).to receive(:table_headers).and_return [] allow(report).to receive(:table_rows).and_return [] allow(report).to receive(:columns).and_return({}) + allow(report).to receive(:fields_to_hide).and_return([]) spree_get :show, report_type: :customers, test: "foo" expect(assigns(:report)).to eq(report) end