From 8f41078c0cc883f72db73947b3ac8cef0abc9517 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Wed, 11 Dec 2013 15:39:50 +1100 Subject: [PATCH] Reworking our bindings so everything stacks on objects and automagically updates --- .../darkswarm/controllers/order_cycle_controller.js.coffee | 2 +- .../javascripts/darkswarm/services/order_cycle.js.coffee | 5 ++--- spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee | 3 ++- 3 files changed, 5 insertions(+), 5 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 262b965373..d16d31603c 100644 --- a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee @@ -1,4 +1,4 @@ Shop.controller "OrderCycleCtrl", ($scope, $rootScope, OrderCycle) -> $scope.order_cycle = OrderCycle.order_cycle $scope.changeOrderCycle = -> - OrderCycle.set_order_cycle() + OrderCycle.push_order_cycle() diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee index 6c98b7a57a..cdb98e9f7b 100644 --- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee +++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee @@ -4,8 +4,7 @@ Shop.factory 'OrderCycle', ($resource, Product) -> order_cycle_id: null } - @set_order_cycle: (id)-> - @order_cycle.order_cycle_id = id - new $resource("/shop/order_cycle").save {order_cycle_id: id}, -> + @push_order_cycle: -> + new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, -> Product.update() diff --git a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee index 0a00cd60d4..ed40d6347b 100644 --- a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee +++ b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee @@ -18,7 +18,8 @@ describe 'OrderCycle service', -> it "posts the order_cycle ID and tells product to update", -> $httpBackend.expectPOST("/shop/order_cycle", {"order_cycle_id" : 10}).respond(200) spyOn(mockProduct, "update") - OrderCycle.set_order_cycle(10) + OrderCycle.order_cycle.order_cycle_id = 10 + OrderCycle.push_order_cycle() $httpBackend.flush() expect(mockProduct.update).toHaveBeenCalled()