diff --git a/app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee b/app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee index 2721c92961..769cec1c18 100644 --- a/app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee +++ b/app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee @@ -1,5 +1,6 @@ -angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filter, Customers, TagRuleResource, CurrentShop, RequestMonitor, Columns, pendingChanges, shops) -> +angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filter, Customers, TagRuleResource, CurrentShop, RequestMonitor, Columns, pendingChanges, shops, availableCountries) -> $scope.shops = shops + $scope.availableCountries = availableCountries $scope.RequestMonitor = RequestMonitor $scope.submitAll = pendingChanges.submitAll $scope.add = Customers.add diff --git a/app/helpers/admin/injection_helper.rb b/app/helpers/admin/injection_helper.rb index 67105b6b34..b528eb84a4 100644 --- a/app/helpers/admin/injection_helper.rb +++ b/app/helpers/admin/injection_helper.rb @@ -39,6 +39,10 @@ module Admin admin_inject_json_ams_array ngModule, "shops", @shops, Api::Admin::IdNameSerializer end + def admin_inject_available_countries(ngModule='admin.customers') + admin_inject_json_ams_array ngModule, 'availableCountries', available_countries, Api::CountrySerializer + end + def admin_inject_hubs(opts={module: 'ofn.admin'}) admin_inject_json_ams_array opts[:module], "hubs", @hubs, Api::Admin::IdNameSerializer end diff --git a/app/views/admin/customers/index.html.haml b/app/views/admin/customers/index.html.haml index 1b713f518b..9fb243e0f8 100644 --- a/app/views/admin/customers/index.html.haml +++ b/app/views/admin/customers/index.html.haml @@ -12,6 +12,7 @@ = admin_inject_column_preferences module: 'admin.customers' = admin_inject_shops += admin_inject_available_countries %div{ ng: { controller: 'customersCtrl' } } .row.filters