raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-07 03:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5304 from dacook/5299-orders-filter-several-tags

Browse Source 
5299 Impossible to filter orders with several tags
This commit is contained in:
Luis Ramos
2020-05-18 11:25:54 +01:00
committed by GitHub
parent 05136b51d1 b4228e8cdd
commit ea8157a5c6
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee
View File

@@ -34,9 +34,8 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $timeout, Reque
'q[bill_address_lastname_start]': $scope['q']['bill_address_lastname_start'],
# Set default checkbox values to null. See: https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498
'q[completed_at_not_null]': $scope['q']['completed_at_not_null'] || null,
'q[distributor_id_in]': $scope['q']['distributor_id_in'],
'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'],
'q[order_cycle_id_in]': $scope['q']['order_cycle_id_in'],
'q[distributor_id_in][]': $scope['q']['distributor_id_in'],
'q[order_cycle_id_in][]': $scope['q']['order_cycle_id_in'],
'q[s]': $scope.sorting || 'completed_at desc',
per_page: $scope.per_page,
page: page