amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-25 05:15:25 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 87a5b99c1c6050fac3ae23cc68cad8099adec7da

Browse Source 
Monotone-Revision: ca4e48599cbe0a9577bf9aa27cd8ffc7e1a0e61c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-05-16T20:33:55
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-05-16 20:33:55 +00:00
parent c6f6ed7f2d
commit 60bef234d7
9 changed files with 130 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/ContactsUI.js
+6 -5
View File
@@ -623,12 +623,13 @@ function onFolderUnsubscribeCB(folderId) {
function onAddressBookRemove(event) {
var selector = $("contactFolders");
var nodes = selector.getSelectedNodes();
if (nodes.length > 0) {
if (nodes.length > 0) {
nodes[0].deselect();
var folderId = nodes[0].getAttribute("id");
var folderIdElements = folderId.split("_");
if (folderIdElements.length > 1)
unsubscribeFromFolder(folderId, onFolderUnsubscribeCB, folderId);
var owner = nodes[0].getAttribute("owner");
if (owner != UserLogin) {
var folderId = nodes[0].getAttribute("id");
unsubscribeFromFolder(folderId, owner, onFolderUnsubscribeCB, folderId);
}
else {
var abId = folderIdElements[0].substr(1);
deletePersonalAddressBook(abId);
UI/WebServerResources/SchedulerUI.js
+5 -4
View File
@@ -1754,10 +1754,11 @@ function onCalendarRemove(event) {
var nodes = $("calendarList").getSelectedNodes();
for (var i = 0; i < nodes.length; i++) {
nodes[i].deselect();
var folderId = nodes[i].getAttribute("id");
var folderIdElements = folderId.split("_");
if (folderIdElements.length > 1) {
unsubscribeFromFolder(folderId, onFolderUnsubscribeCB, folderId);
var owner = nodes[i].getAttribute("owner");
if (owner != UserLogin) {
var folderId = nodes[i].getAttribute("id");
unsubscribeFromFolder(folderId, owner,
onFolderUnsubscribeCB, folderId);
}
else
deletePersonalCalendar(folderIdElements[0]);
UI/WebServerResources/generic.js
+5 -7
View File
@@ -1061,18 +1061,16 @@ function folderUnsubscriptionCallback(http) {
}
}
function unsubscribeFromFolder(folder, refreshCallback, refreshCallbackData) {
function unsubscribeFromFolder(folder, owner, refreshCallback,
refreshCallbackData) {
if (document.body.hasClassName("popup")) {
window.opener.unsubscribeFromFolder(folder, refreshCallback,
refreshCallbackData);
}
else {
var folderData = folder.split("_");
var username = folderData[0];
var folderPath = folderData[1];
if (username.startsWith('/'))
username = username.substring(1);
if (username != UserLogin) {
if (owner.startsWith('/'))
owner = owner.substring(1);
if (owner != UserLogin) {
var url = (ApplicationBaseURL + folder + "/unsubscribe");
removeFolderRequestCount++;
var rfCbData = { method: refreshCallback, data: refreshCallbackData };