From 2a053400d702267ff8eed624d166080dfcf12c0a Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 6 Jun 2016 10:32:45 -0400
Subject: [PATCH] (js) Fix loading of card from global addressbooks

---
 NEWS                                                       | 1 +
 UI/WebServerResources/js/Contacts/AddressBook.service.js   | 1 +
 UI/WebServerResources/js/Contacts/AddressBookController.js | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index a62353b43..ddd80b850 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Bug fixes
  - [web] fixed user removal from ACLs in Administration module (#3713)
  - [web] fixed event classification icon (private/confidential) in month view (#3711)
  - [web] CKEditor: added the pastefromword plugin (#2295, #3313)
+ - [web] fixed loading of card from global addressbooks
 
 3.1.1 (2016-06-02)
 ------------------
diff --git a/UI/WebServerResources/js/Contacts/AddressBook.service.js b/UI/WebServerResources/js/Contacts/AddressBook.service.js
index b97e82b4e..8bfd32393 100644
--- a/UI/WebServerResources/js/Contacts/AddressBook.service.js
+++ b/UI/WebServerResources/js/Contacts/AddressBook.service.js
@@ -702,6 +702,7 @@
             _this.$cards = [];
             angular.forEach(response.headers, function(data) {
               var o = _.zipObject(headers, data);
+              angular.extend(o, { pid: _this.id });
               _this.$cards.push(new AddressBook.$Card(o));
             });
           }
diff --git a/UI/WebServerResources/js/Contacts/AddressBookController.js b/UI/WebServerResources/js/Contacts/AddressBookController.js
index cca2da3e9..67cae8e21 100644
--- a/UI/WebServerResources/js/Contacts/AddressBookController.js
+++ b/UI/WebServerResources/js/Contacts/AddressBookController.js
@@ -30,7 +30,7 @@
     vm.mode = { search: false, multiple: 0 };
     
     function selectCard(card) {
-      $state.go('app.addressbook.card.view', {addressbookId: stateAddressbook.id, cardId: card.id});
+      $state.go('app.addressbook.card.view', {cardId: card.id});
     }
     
     function toggleCardSelection($event, card) {