From eb7b2e7a3b8b0b54a9c9fba19c6fb6bd31c2554b Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Thu, 5 Nov 2015 17:17:45 +1100 Subject: [PATCH] Use ams_prefix not ams_suffix! --- .../controllers/enterprises_controller.js.coffee | 2 +- app/controllers/admin/order_cycles_controller.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/enterprises/controllers/enterprises_controller.js.coffee b/app/assets/javascripts/admin/enterprises/controllers/enterprises_controller.js.coffee index ea5ab9186c..3d8bfa6446 100644 --- a/app/assets/javascripts/admin/enterprises/controllers/enterprises_controller.js.coffee +++ b/app/assets/javascripts/admin/enterprises/controllers/enterprises_controller.js.coffee @@ -1,6 +1,6 @@ angular.module("admin.enterprises").controller 'enterprisesCtrl', ($scope, $q, Enterprises, Columns) -> requests = [] - requests.push ($scope.allEnterprises = Enterprises.index(ams_suffix: "index")).$promise + requests.push ($scope.allEnterprises = Enterprises.index(ams_prefix: "index")).$promise $q.all(requests).then -> $scope.loaded = true diff --git a/app/controllers/admin/order_cycles_controller.rb b/app/controllers/admin/order_cycles_controller.rb index 2309ba36ee..2b381e1e98 100644 --- a/app/controllers/admin/order_cycles_controller.rb +++ b/app/controllers/admin/order_cycles_controller.rb @@ -15,7 +15,7 @@ module Admin respond_to do |format| format.html format.json do - render_as_json @collection, ams_prefix: params[:ams_suffix], current_user: spree_current_user + render_as_json @collection, ams_prefix: params[:ams_prefix], current_user: spree_current_user end end end @@ -163,5 +163,9 @@ module Admin end end end + + def ams_prefix_whitelist + [:basic] + end end end