diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m index 5afd887f3..be82394fb 100644 --- a/SoObjects/Contacts/SOGoContactSourceFolder.m +++ b/SoObjects/Contacts/SOGoContactSourceFolder.m @@ -239,6 +239,9 @@ [newRecord setObject: [oldRecord objectForKey: @"c_uid"] forKey: @"c_uid"]; + //source id + [newRecord setObject: [source sourceID] forKey: @"sourceID"]; + // c_name => id [newRecord setObject: [oldRecord objectForKey: @"c_name"] forKey: @"c_name"]; diff --git a/UI/WebServerResources/js/Contacts/AddressBook.service.js b/UI/WebServerResources/js/Contacts/AddressBook.service.js index ae3414e62..832bf1d76 100644 --- a/UI/WebServerResources/js/Contacts/AddressBook.service.js +++ b/UI/WebServerResources/js/Contacts/AddressBook.service.js @@ -103,7 +103,12 @@ return AddressBook.$$resource.fetch(null, 'allContactSearch', params).then(function(response) { var results, card, index, compareIds = function(data) { - return this.id == data.id; + if(this.sourceID === undefined || data.sourceid === undefined) { + return this.id == data.id; + } + else { + return this.id == data.id && this.sourceID == data.sourceid; + } }; if (excludedCards) { // Remove excluded cards from results @@ -130,7 +135,7 @@ cards.splice(index, 0, card); } }); - AddressBook.$log.debug(cards); + // AddressBook.$log.debug(cards); return cards; }); };