From f4572cb8cb33591da7042464139f021718a086b5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 7 Nov 2022 11:44:01 +0100 Subject: [PATCH 1/2] `nil` is the value of `:report_format` when GETting a report page This method is used in `custom_headers()` method that handle headers customization. Then, it's `@report.available_headers` --- lib/reporting/report_renderer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting/report_renderer.rb b/lib/reporting/report_renderer.rb index 0c56d6daab..274bdf95c2 100644 --- a/lib/reporting/report_renderer.rb +++ b/lib/reporting/report_renderer.rb @@ -15,7 +15,7 @@ module Reporting end def html_render? - @report.params[:report_format].in?(['', 'pdf']) + @report.params[:report_format].in?([nil, '', 'pdf']) end def display_header_row? From 3e9647590d8fe5bd857bcf7b2d4cc40d1c6a54f8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 7 Nov 2022 15:53:39 +0100 Subject: [PATCH 2/2] Packing report don't need untranslated headers for xlxs, csv format --- lib/reporting/reports/packing/base.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/reporting/reports/packing/base.rb b/lib/reporting/reports/packing/base.rb index 585029dd38..e561f3a81b 100644 --- a/lib/reporting/reports/packing/base.rb +++ b/lib/reporting/reports/packing/base.rb @@ -29,13 +29,6 @@ module Reporting { quantity: :quantity } end - def custom_headers - return {} if html_render? - - # Use non translated headers to avoid breaking changes - @custom_headers ||= report_data.columns.index_by(&:itself).symbolize_keys - end - def default_params # Prevent breaking change in this report by hidding new columns by default { fields_to_hide: ["phone", "price"],