From ed7a53968cafbb3410ef2c8b9a2d9413a568a772 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Thu, 4 Jun 2015 12:04:47 +0800 Subject: [PATCH] Using clearer json_request? method for customers controller --- app/controllers/admin/customers_controller.rb | 2 +- app/controllers/spree/admin/base_controller_decorator.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/customers_controller.rb b/app/controllers/admin/customers_controller.rb index 27b5b1380d..b1ceb88c2f 100644 --- a/app/controllers/admin/customers_controller.rb +++ b/app/controllers/admin/customers_controller.rb @@ -17,7 +17,7 @@ module Admin private def collection - return Customer.where("1=0") if html_request? || params[:enterprise_id].nil? + return Customer.where("1=0") unless json_request? && params[:enterprise_id].present? enterprise = Enterprise.managed_by(spree_current_user).find_by_id(params[:enterprise_id]) Customer.of(enterprise) end diff --git a/app/controllers/spree/admin/base_controller_decorator.rb b/app/controllers/spree/admin/base_controller_decorator.rb index 3fa6a5c5e1..4579e905e7 100644 --- a/app/controllers/spree/admin/base_controller_decorator.rb +++ b/app/controllers/spree/admin/base_controller_decorator.rb @@ -62,4 +62,8 @@ Spree::Admin::BaseController.class_eval do def html_request? request.format.html? end + + def json_request? + request.format.json? + end end