From bf2bd403a4480900e552f0ea0670f133ee50b409 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Tue, 28 Jul 2015 16:53:33 +1000
Subject: [PATCH] Clear variants when order cycle changed, not when products
 are initially loaded

---
 .../controllers/order_cycle_controller.js.coffee   | 14 +++++++++-----
 .../darkswarm/services/products.js.coffee          |  2 --
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
index 2f1394e90a..3fec7cfe9d 100644
--- a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
@@ -1,6 +1,6 @@
 # TODO this SUCKS. Fix it
 
-Darkswarm.controller "OrderCycleCtrl", ($scope, OrderCycle, $timeout) ->
+Darkswarm.controller "OrderCycleCtrl", ($scope, $timeout, OrderCycle) ->
   $scope.order_cycle = OrderCycle.order_cycle
   $scope.OrderCycle = OrderCycle
 
@@ -9,11 +9,15 @@ Darkswarm.controller "OrderCycleCtrl", ($scope, OrderCycle, $timeout) ->
   # That takes an expression instead of a trigger, and binds to that
   $timeout =>
     if !$scope.OrderCycle.selected()
-      $("#order_cycle_id").trigger("openTrigger") 
+      $("#order_cycle_id").trigger("openTrigger")
 
 
-Darkswarm.controller "OrderCycleChangeCtrl", ($scope, OrderCycle, Products, $timeout) ->
+Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $timeout, OrderCycle, Products, Variants) ->
   $scope.changeOrderCycle = ->
-    OrderCycle.push_order_cycle Products.update
+    OrderCycle.push_order_cycle $scope.orderCycleChanged
     $timeout ->
-      $("#order_cycle_id").trigger("closeTrigger") 
+      $("#order_cycle_id").trigger("closeTrigger")
+
+  $scope.orderCycleChanged = ->
+    Variants.clear()
+    Products.update()
diff --git a/app/assets/javascripts/darkswarm/services/products.js.coffee b/app/assets/javascripts/darkswarm/services/products.js.coffee
index 4a415bba24..3bd0b35e8f 100644
--- a/app/assets/javascripts/darkswarm/services/products.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/products.js.coffee
@@ -12,8 +12,6 @@ Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Pro
       @loading = true
       @products = []
       $resource("/shop/products").query (products)=>
-        Variants.clear()
-
         @products = products
 
         @extend()