From e98031e58111e6ddd321b24c242b880f2931f966 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Fri, 13 Dec 2013 10:12:41 +1100 Subject: [PATCH] Fixing some minor report bugs --- app/controllers/spree/admin/reports_controller_decorator.rb | 3 +++ app/views/spree/admin/reports/products_and_inventory.html.haml | 2 +- spec/features/admin/reports_spec.rb | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index bae1f36374..31ea232976 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -50,6 +50,8 @@ Spree::Admin::ReportsController.class_eval do @report_types = REPORT_TYPES[:customers] @report_type = params[:report_type] @report = OpenFoodNetwork::CustomersReport.new spree_current_user, params + + render_report(@report.header, @report.table, params[:csv], "customers.csv") end def orders_and_distributors @@ -557,6 +559,7 @@ Spree::Admin::ReportsController.class_eval do @report = OpenFoodNetwork::ProductsAndInventoryReport.new spree_current_user, params #@table = @report.table #@header = @report.header + render_report(@report.header, @report.table, params[:csv], "products_and_inventory.csv") end def render_report (header, table, create_csv, csv_file_name) diff --git a/app/views/spree/admin/reports/products_and_inventory.html.haml b/app/views/spree/admin/reports/products_and_inventory.html.haml index 23228ffb71..93859d0c58 100644 --- a/app/views/spree/admin/reports/products_and_inventory.html.haml +++ b/app/views/spree/admin/reports/products_and_inventory.html.haml @@ -20,7 +20,7 @@ %br = label_tag nil, "Report Type: " - = select_tag(:report_type, options_for_select(@report_types, @report_type)) + = select_tag(:report_type, options_for_select(@report_types, params[:report_type])) %br %br diff --git a/spec/features/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb index 1b3a2055e9..a1e788a932 100644 --- a/spec/features/admin/reports_spec.rb +++ b/spec/features/admin/reports_spec.rb @@ -150,6 +150,5 @@ feature %q{ ].sort end end - end