From dfb750caf441d4c45368cc83be7394760e17aeb1 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 20 Jul 2015 15:32:57 -0400
Subject: [PATCH] (fix) Resolve addressbook before rendering view

---
 UI/WebServerResources/js/Contacts.app.js                 | 2 +-
 UI/WebServerResources/js/Contacts/AddressBook.service.js | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/UI/WebServerResources/js/Contacts.app.js b/UI/WebServerResources/js/Contacts.app.js
index e42998943..94f2d57d7 100644
--- a/UI/WebServerResources/js/Contacts.app.js
+++ b/UI/WebServerResources/js/Contacts.app.js
@@ -117,7 +117,7 @@
    */
   stateAddressbook.$inject = ['$stateParams', 'AddressBook'];
   function stateAddressbook($stateParams, AddressBook) {
-    return AddressBook.$find($stateParams.addressbookId);
+    return AddressBook.$find($stateParams.addressbookId).$futureAddressBookData;
   }
 
   /**
diff --git a/UI/WebServerResources/js/Contacts/AddressBook.service.js b/UI/WebServerResources/js/Contacts/AddressBook.service.js
index 3348dc88d..259ab0d86 100644
--- a/UI/WebServerResources/js/Contacts/AddressBook.service.js
+++ b/UI/WebServerResources/js/Contacts/AddressBook.service.js
@@ -420,10 +420,8 @@
   AddressBook.prototype.$unwrap = function(futureAddressBookData) {
     var _this = this;
 
-    // Expose the promise
-    this.$futureAddressBookData = futureAddressBookData;
-    // Resolve the promise
-    this.$futureAddressBookData.then(function(data) {
+    // Expose and sesolve the promise
+    this.$futureAddressBookData = futureAddressBookData.then(function(data) {
       return AddressBook.$timeout(function() {
         // Extend AddressBook instance from data of addressbooks list.
         // Will inherit attributes such as isEditable and isRemote.