From 5c9c96e17423cbd5c77fa65e457a43c6a683547b Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 24 Oct 2013 13:40:27 +1100 Subject: [PATCH] Do not error if order cycle loads before enterprises --- app/assets/javascripts/admin/order_cycle.js.erb.coffee | 5 +++-- spec/javascripts/unit/order_cycle_spec.js.coffee | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/order_cycle.js.erb.coffee b/app/assets/javascripts/admin/order_cycle.js.erb.coffee index d872942329..60395fe474 100644 --- a/app/assets/javascripts/admin/order_cycle.js.erb.coffee +++ b/app/assets/javascripts/admin/order_cycle.js.erb.coffee @@ -328,8 +328,9 @@ angular.module('order_cycle', ['ngResource']) totalVariants: (enterprise) -> numVariants = 0 - counts = for product in enterprise.supplied_products - numVariants += if product.variants.length == 0 then 1 else product.variants.length + if enterprise + counts = for product in enterprise.supplied_products + numVariants += if product.variants.length == 0 then 1 else product.variants.length numVariants }]) diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee index b3e3d68dbf..6d75d2b8ea 100644 --- a/spec/javascripts/unit/order_cycle_spec.js.coffee +++ b/spec/javascripts/unit/order_cycle_spec.js.coffee @@ -342,6 +342,8 @@ describe 'OrderCycle services', -> expect(Enterprise.totalVariants(enterprise)).toEqual(5) + it 'returns zero when enterprise is null', -> + expect(Enterprise.totalVariants(null)).toEqual(0) describe 'EnterpriseFee service', -> $httpBackend = null