Merge f2dc102 into 080ba83

SEED-platform · Jan 24, 2020 · a68b24f · a68b24f
2 parents 080ba83 + f2dc102
commit a68b24f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/seed/static/seed/js/controllers/inventory_list_controller.js b/seed/static/seed/js/controllers/inventory_list_controller.js
@@ -59,7 +59,7 @@ angular.module('BE.seed.controller.inventory_list', [])
       $scope.data = [];
       var lastCycleId = inventory_service.get_last_cycle();
       $scope.cycle = {
-        selected_cycle: lastCycleId ? _.find(cycles.cycles, {id: lastCycleId}) : _.first(cycles.cycles),
+        selected_cycle:  _.find(cycles.cycles, {id: lastCycleId}) || _.first(cycles.cycles),
         cycles: cycles.cycles
       };
 

diff --git a/seed/static/seed/js/controllers/inventory_map_controller.js b/seed/static/seed/js/controllers/inventory_map_controller.js
@@ -34,7 +34,7 @@ angular.module('BE.seed.controller.inventory_map', [])
 
       var lastCycleId = inventory_service.get_last_cycle();
       $scope.cycle = {
-        selected_cycle: lastCycleId ? _.find(cycles.cycles, {id: lastCycleId}) : _.first(cycles.cycles),
+        selected_cycle: _.find(cycles.cycles, {id: lastCycleId}) || _.first(cycles.cycles),
         cycles: cycles.cycles
       };
 
@@ -614,4 +614,3 @@ angular.module('BE.seed.controller.inventory_map', [])
         };
       });
     }]);
-
diff --git a/seed/static/seed/js/controllers/pairing_controller.js b/seed/static/seed/js/controllers/pairing_controller.js
@@ -70,7 +70,7 @@ angular.module('BE.seed.controller.pairing', []).controller('pairing_controller'
 
     var lastCycleId = inventory_service.get_last_cycle();
     $scope.cycle = {
-      selected_cycle: lastCycleId ? _.find(cycles.cycles, {id: lastCycleId}) : _.first(cycles.cycles),
+      selected_cycle: _.find(cycles.cycles, {id: lastCycleId}) || _.first(cycles.cycles),
       cycles: cycles.cycles
     };