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

Rewrite existing specs

Browse Source
This commit is contained in:
Matt-Yorkley
2018-09-17 16:34:52 +01:00
parent 68f0c80016
commit b2551b4e0b
9 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ angular.module("admin.orders").controller "ordersCtrl", ($scope, $injector, Requ
})
$scope.$watch 'sortOptions', (sort) ->
if sort.predicate != ""
if sort && sort.predicate != ""
$scope.sorting = sort.predicate + ' desc' if sort.reverse
$scope.sorting = sort.predicate + ' asc' if !sort.reverse
$scope.fetchResults()

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

@@ -107,17 +107,16 @@ Spree::Admin::OrdersController.class_eval do
private
def orders
@search = if json_request?
OpenFoodNetwork::Permissions.new(spree_current_user).editable_orders.ransack(params[:q])
else
Spree::Order.accessible_by(current_ability, :index).ransack(params[:q])
end
if json_request?
@search = OpenFoodNetwork::Permissions.new(spree_current_user).editable_orders.ransack(params[:q])
else
@search = Spree::Order.accessible_by(current_ability, :index).ransack(params[:q])
# Replaced this search to filter orders to only show those distributed by current user (or all for admin user)
@search.result.includes([:user, :shipments, :payments]).
distributed_by_user(spree_current_user).
page(params[:page]).
per(params[:per_page] || Spree::Config[:orders_per_page])
# Replaced this search to filter orders to only show those distributed by current user (or all for admin user)
@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])
end
def require_distributor_abn