diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 4e3410519..2d804b7d2 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -626,17 +626,18 @@ function onAddressBookRemove(event) { if (nodes.length > 0) { nodes[0].deselect(); var owner = nodes[0].getAttribute("owner"); - if (owner != UserLogin) { - var folderId = nodes[0].getAttribute("id"); - unsubscribeFromFolder(folderId, owner, onFolderUnsubscribeCB, folderId); - } - else { + if (owner == UserLogin) { + var folderIdElements = nodes[0].getAttribute("id").split(":"); var abId = folderIdElements[0].substr(1); deletePersonalAddressBook(abId); var personal = $("/personal"); personal.selectElement(); onFolderSelectionChange(); } + else { + var folderId = nodes[0].getAttribute("id"); + unsubscribeFromFolder(folderId, owner, onFolderUnsubscribeCB, folderId); + } } preventDefault(event); @@ -650,7 +651,7 @@ function deletePersonalAddressBook(folderId) { document.deletePersonalABAjaxRequest.aborted = true; document.deletePersonalABAjaxRequest.abort(); } - var url = ApplicationBaseURL + "/" + folderId + "/deleteFolder"; + var url = ApplicationBaseURL + folderId + "/deleteFolder"; document.deletePersonalABAjaxRequest = triggerAjaxRequest(url, deletePersonalAddressBookCallback, folderId);