From a6f116aa091310c36791ff1fea2aacd11f32ffba Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Wed, 10 Dec 2014 11:59:00 +1100 Subject: [PATCH] WIP: Rename override_variants to variant_overrides - JS --- .../admin/controllers/override_variants_controller.js.coffee | 2 +- app/views/spree/admin/products/variant_overrides.html.haml | 2 +- .../controllers/override_variants_controller_spec.js.coffee | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/override_variants_controller.js.coffee b/app/assets/javascripts/admin/controllers/override_variants_controller.js.coffee index 1d6fe64a70..560bd975e7 100644 --- a/app/assets/javascripts/admin/controllers/override_variants_controller.js.coffee +++ b/app/assets/javascripts/admin/controllers/override_variants_controller.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").controller "AdminOverrideVariantsCtrl", ($scope, $timeout, Indexer, SpreeApiAuth, PagedFetcher, StatusMessage, hubs, producers, hubPermissions, VariantOverrides, DirtyVariantOverrides) -> +angular.module("ofn.admin").controller "AdminVariantOverridesCtrl", ($scope, $timeout, Indexer, SpreeApiAuth, PagedFetcher, StatusMessage, hubs, producers, hubPermissions, VariantOverrides, DirtyVariantOverrides) -> $scope.hubs = hubs $scope.hub = null $scope.products = [] diff --git a/app/views/spree/admin/products/variant_overrides.html.haml b/app/views/spree/admin/products/variant_overrides.html.haml index d4a0600712..0297e6c985 100644 --- a/app/views/spree/admin/products/variant_overrides.html.haml +++ b/app/views/spree/admin/products/variant_overrides.html.haml @@ -1,7 +1,7 @@ = render 'spree/admin/products/variant_overrides/header' = render 'spree/admin/products/variant_overrides/data' -%div{ ng: { app: 'ofn.admin', controller: 'AdminOverrideVariantsCtrl', init: 'initialise()' } } +%div{ ng: { app: 'ofn.admin', controller: 'AdminVariantOverridesCtrl', init: 'initialise()' } } = render 'spree/admin/products/variant_overrides/hub_choice' %div{ng: {show: 'hub'}} diff --git a/spec/javascripts/unit/admin/controllers/override_variants_controller_spec.js.coffee b/spec/javascripts/unit/admin/controllers/override_variants_controller_spec.js.coffee index 7ab4c177dc..410d75cf50 100644 --- a/spec/javascripts/unit/admin/controllers/override_variants_controller_spec.js.coffee +++ b/spec/javascripts/unit/admin/controllers/override_variants_controller_spec.js.coffee @@ -1,4 +1,4 @@ -describe "OverrideVariantsCtrl", -> +describe "VariantOverridesCtrl", -> ctrl = null scope = null hubs = [{id: 1, name: 'Hub'}] @@ -18,7 +18,7 @@ describe "OverrideVariantsCtrl", -> inject ($controller, Indexer, _VariantOverrides_) -> VariantOverrides = _VariantOverrides_ - ctrl = $controller 'AdminOverrideVariantsCtrl', {$scope: scope, Indexer: Indexer, hubs: hubs, producers: producers, products: products, hubPermissions: hubPermissions, VariantOverrides: _VariantOverrides_} + ctrl = $controller 'AdminVariantOverridesCtrl', {$scope: scope, Indexer: Indexer, hubs: hubs, producers: producers, products: products, hubPermissions: hubPermissions, VariantOverrides: _VariantOverrides_} it "initialises the hub list and the chosen hub", -> expect(scope.hubs).toEqual hubs