diff --git a/app/assets/javascripts/admin/index_utils/services/paged_fetcher.js.coffee b/app/assets/javascripts/admin/index_utils/services/paged_fetcher.js.coffee index 96836ef9cc..732f4a811f 100644 --- a/app/assets/javascripts/admin/index_utils/services/paged_fetcher.js.coffee +++ b/app/assets/javascripts/admin/index_utils/services/paged_fetcher.js.coffee @@ -16,7 +16,7 @@ angular.module("admin.indexUtils").factory "PagedFetcher", (dataFetcher) -> fetchPages: (url, page, pageCallback) -> dataFetcher(@urlForPage(url, page)).then (data) => @page++ - @last_page = data.pages + @last_page = data.pagination.pages pageCallback(data) if pageCallback diff --git a/app/controllers/api/products_controller.rb b/app/controllers/api/products_controller.rb index 3509d33bfd..0dd2d26d60 100644 --- a/app/controllers/api/products_controller.rb +++ b/app/controllers/api/products_controller.rb @@ -130,18 +130,15 @@ module Api end def render_paged_products(products, product_serializer = ::Api::Admin::ProductSerializer) - serializer = ActiveModel::ArraySerializer.new( + serialized_products = ActiveModel::ArraySerializer.new( products, each_serializer: product_serializer ) - render text: { - products: serializer, - # This line is used by the PagedFetcher JS service (inventory). - pages: products.num_pages, - # This hash is used by the BulkProducts JS service. + render json: { + products: serialized_products, pagination: pagination_data(products) - }.to_json + } end def query_params_with_defaults