From 961fa9ab4e84d26e00ed3970aa8bbdd2839432fe Mon Sep 17 00:00:00 2001 From: miha Date: Tue, 6 Apr 2021 09:59:24 +0200 Subject: [PATCH] [SCI-5631] Add ordering to index endpoint so pagination works, limit maximum page size for kaminari --- app/controllers/api/v1/inventory_items_controller.rb | 1 + config/initializers/kaminari_config.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/inventory_items_controller.rb b/app/controllers/api/v1/inventory_items_controller.rb index aecdff04e..0cb9b8c29 100644 --- a/app/controllers/api/v1/inventory_items_controller.rb +++ b/app/controllers/api/v1/inventory_items_controller.rb @@ -17,6 +17,7 @@ module Api .preload(repository_cells: @inventory.cell_preload_includes) .page(params.dig(:page, :number)) .per(params.dig(:page, :size)) + .order(:id) render jsonapi: items, each_serializer: InventoryItemSerializer, include: include_params end diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb index 2dd4e31b8..7ea7b2b42 100644 --- a/config/initializers/kaminari_config.rb +++ b/config/initializers/kaminari_config.rb @@ -2,7 +2,7 @@ Kaminari.configure do |config| config.default_per_page = 10 - # config.max_per_page = nil + config.max_per_page = 100 # config.window = 4 # config.outer_window = 0 # config.left = 0