From 3f3f58dc9fcf4cc718fc4dcb66bb8ba7499ffde1 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 24 May 2017 13:56:20 -0400
Subject: [PATCH] (js) Fix card loading via router

---
 .../js/Contacts/Contacts.app.js               | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/UI/WebServerResources/js/Contacts/Contacts.app.js b/UI/WebServerResources/js/Contacts/Contacts.app.js
index 9764a4032..cc38d019d 100644
--- a/UI/WebServerResources/js/Contacts/Contacts.app.js
+++ b/UI/WebServerResources/js/Contacts/Contacts.app.js
@@ -133,19 +133,19 @@
    */
   stateCard.$inject = ['$state', '$stateParams', 'stateAddressbook'];
   function stateCard($state, $stateParams, stateAddressbook) {
-    var card;
+    return stateAddressbook.$futureAddressBookData.then(function() {
+      var card = _.find(stateAddressbook.$cards, function(cardObject) {
+        return (cardObject.id == $stateParams.cardId);
+      });
 
-    card = _.find(stateAddressbook.$cards, function(cardObject) {
-      return (cardObject.id == $stateParams.cardId);
+      if (card) {
+        return card.$reload();
+      }
+      else {
+        // Card not found
+        $state.go('app.addressbook');
+      }
     });
-
-    if (card) {
-      return card.$reload();
-    }
-    else {
-      // Card not found
-      $state.go('app.addressbook');
-    }
   }
 
   /**