Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Properly respect admin per page configuration for products/orders pag… (#12792)
Damian Legawiece978680f715b
diff --git a/admin/app/controllers/spree/admin/products_controller.rb b/admin/app/controllers/spree/admin/products_controller.rbindex 29b10b0796..40e0de7b6a 100644--- a/admin/app/controllers/spree/admin/products_controller.rb+++ b/admin/app/controllers/spree/admin/products_controller.rb@@ -274,7 +274,7 @@ module Spreefor_ordering_with_translations(model_class, :name).includes(product_includes).page(params[:page]).- per(params[:per_page] || ENV.fetch('ADMIN_PRODUCTS_PER_PAGE', 25))+ per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_products_per_page)@collectionenddiff --git a/admin/app/helpers/spree/admin/orders_filters_helper.rb b/admin/app/helpers/spree/admin/orders_filters_helper.rbindex 9f549e9974..00e82650d8 100644--- a/admin/app/helpers/spree/admin/orders_filters_helper.rb+++ b/admin/app/helpers/spree/admin/orders_filters_helper.rb@@ -57,7 +57,7 @@ module Spree# lazy loading other models here (via includes) may result in an invalid query# e.g. SELECT DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"# see https://github.com/spree/spree/pull/3919- @orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page])+ @orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_orders_per_page)enddef load_user