From f77beb50ff8cf5e0f93dac7a26f697f5475b509b Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Thu, 18 Jul 2019 17:58:08 +0100 Subject: [PATCH] Fix class scope in spree/api/products_controller, should not use Spree namespace here Also, add missing dependency to spree/admin/products_controller_decorator --- app/controllers/spree/admin/products_controller_decorator.rb | 1 + app/controllers/spree/api/products_controller.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/spree/admin/products_controller_decorator.rb b/app/controllers/spree/admin/products_controller_decorator.rb index 016883b840..5ecf0ecce0 100644 --- a/app/controllers/spree/admin/products_controller_decorator.rb +++ b/app/controllers/spree/admin/products_controller_decorator.rb @@ -1,5 +1,6 @@ require 'open_food_network/spree_api_key_loader' require 'open_food_network/referer_parser' +require 'open_food_network/permissions' Spree::Admin::ProductsController.class_eval do include OpenFoodNetwork::SpreeApiKeyLoader diff --git a/app/controllers/spree/api/products_controller.rb b/app/controllers/spree/api/products_controller.rb index fbad83daf7..491abe6f4a 100644 --- a/app/controllers/spree/api/products_controller.rb +++ b/app/controllers/spree/api/products_controller.rb @@ -137,7 +137,7 @@ module Spree def render_paged_products(products) serializer = ActiveModel::ArraySerializer.new( products, - each_serializer: Api::Admin::ProductSerializer + each_serializer: ::Api::Admin::ProductSerializer ) render text: { products: serializer, pages: products.num_pages }.to_json