rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity

Merge pull request #949 from owncloud/fix-js-error-on-delete

Browse Source 
handle undefined contact
This commit is contained in:
Thomas Müller 2015-07-05 08:24:22 +02:00
commit 6f5dff84bf
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/contacts.js
View File

@ -15,17 +15,17 @@ OC.Contacts = OC.Contacts || {};
*/
var Contact = function(parent, id, metadata, data, listtemplate, dragtemplate, fulltemplate, detailtemplates) {
//console.log('contact:', id, metadata, data); //parent, id, data, listtemplate, fulltemplate);
this.parent = parent,
this.storage = parent.storage,
this.id = id,
this.metadata = metadata,
this.data = data,
this.$dragTemplate = dragtemplate,
this.$listTemplate = listtemplate,
this.$fullTemplate = fulltemplate;
this.detailTemplates = detailtemplates;
this.displayNames = {};
this.sortOrder = contacts_sortby || 'fn';
this.parent = parent;
this.storage = parent.storage;
this.id = id;
this.metadata = metadata;
this.data = data;
this.$dragTemplate = dragtemplate;
this.$listTemplate = listtemplate;
this.$fullTemplate = fulltemplate;
this.detailTemplates = detailtemplates;
this.displayNames = {};
this.sortOrder = contacts_sortby || 'fn';
this.undoQueue = [];
this.multi_properties = ['EMAIL', 'TEL', 'IMPP', 'ADR', 'URL', 'CLOUD'];
};
@ -2309,13 +2309,15 @@ OC.Contacts = OC.Contacts || {};
// Make a map of backends, address books and contacts for easier processing.
do {
contact = this.deletionQueue.shift();
if(!contactMap[contact.getBackend()]) {
contactMap[contact.getBackend()] = {};
if (!_.isUndefined(contact)) {
if(!contactMap[contact.getBackend()]) {
contactMap[contact.getBackend()] = {};
}
if(!contactMap[contact.getBackend()][contact.getParent()]) {
contactMap[contact.getBackend()][contact.getParent()] = [];
}
contactMap[contact.getBackend()][contact.getParent()].push(contact.getId());
}
if(!contactMap[contact.getBackend()][contact.getParent()]) {
contactMap[contact.getBackend()][contact.getParent()] = [];
}
contactMap[contact.getBackend()][contact.getParent()].push(contact.getId());
} while(this.deletionQueue.length > 0);
console.log('map', contactMap);