From 745e869b31ce8990c06bb7a1daafaeb490ba8841 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 25 Apr 2011 13:56:33 +0000 Subject: [PATCH] See ChangeLog. Monotone-Parent: 91cc46c3a339f692e2b6d79b450a1a56ea5789e9 Monotone-Revision: 9d24795a2fc24ed377c4058ed7f74020e0115c84 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-04-25T13:56:33 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ UI/WebServerResources/SchedulerUI.js | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b98904855..339ca7253 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-04-25 Francis Lachapelle + + * UI/WebServerResources/SchedulerUI.js (onFolderUnsubscribeCB): + select the personal calendar to avoid trying creating an event or + a task in the calendar to which the user has just unsubscribed. + 2011-04-25 Ludovic Marcotte * Added the concept of "resources" in SOGo in order diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 881d1dc27..f0d9cf492 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -2752,8 +2752,11 @@ function onFolderSubscribeCB(folderData) { function onFolderUnsubscribeCB(folderId) { var node = $(folderId); - node.parentNode.removeChild(node); + var list = $(node.parentNode); + node.deselect(); + list.removeChild(node); if (removeFolderRequestCount == 0) { + list.down("li").selectElement(); // personal calendar refreshEvents(); refreshTasks(); changeCalendarDisplay();