raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-06 02:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pagination conflict with LineItemsCtrl requests

Browse Source
This commit is contained in:
Matt-Yorkley
2018-10-22 17:55:43 +01:00
parent f8bccda6ab
commit 42c1584e6f
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/controllers/spree/admin/orders_controller_decorator.rb
View File

@@ -63,12 +63,7 @@ Spree::Admin::OrdersController.class_eval do
format.json do
render json: {
orders: ActiveModel::ArraySerializer.new(@orders, each_serializer: Api::Admin::OrderSerializer),
pagination: {
results: @orders.total_count,
pages: @orders.num_pages.to_i,
page: params[:page].to_i,
per_page: params[:per_page].to_i
}
pagination: pagination_data
}
end
end
@@ -117,7 +112,30 @@ Spree::Admin::OrdersController.class_eval do
@search.result.includes([:user, :shipments, :payments]).distributed_by_user(spree_current_user)
end
@search.result.page(params[:page]).per(params[:per_page] || Spree::Config[:orders_per_page])
search_results
end
def search_results
if using_pagination?
@search.result.page(params[:page]).per(params[:per_page] || Spree::Config[:orders_per_page])
else
@search.result
end
end
def using_pagination?
params[:per_page]
end
def pagination_data
if using_pagination?
{
results: @orders.total_count,
pages: @orders.num_pages,
page: params[:page].to_i,
per_page: params[:per_page].to_i
}
end
end
def require_distributor_abn