git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1418 d1b88da0-ebda-0310...

diff --git a/NEWS b/NEWS
index 88e8fd54287aac9cb3bf2f3471ace1a5f6a71644..4241cb32cc1701dec7256fdd9b4038109f56bd3c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,26 +1,25 @@
 0.9.0-20080520 (1.0 rc6)
 ------------------------
-- retrieving the freebusy DAV object was causing SOGo to crash
-- converted to use the gnustep-make 2 build framework
-- added custom DAV methods for managing user permissions from the SOGo Integrator
-- pressing enter in the contact edition dialog will perform the creation/update operation
-- implemented more of the CalDAV specification for compatibility with Lightning 0.8
-- added Italian translation, thanks to Marco Lertora and Sauro Saltini
-- added initial logic for splitting overlapping events
-- improved restoration of drag handles state
-- improved contextual menu handling of Address Book module
-- fixed time/date control widget of attendees editor
-- fixed various bugs occuring with Safari 3.1
-- monthly events would not be returned properly
-- bi-weekly events would appear every week instead
-- weekly events with specified days of week would not appear on the correct days
-- started supporting Lightning 0.8, improved general implementation of the CalDAV protocol
-- added support for calendar colors, both in the web and DAV interfaces
-- refactored and fixed the implementation of DAV acl, with partial support for CalDAV Scheduling extensions
-- removed the limitation that prevented the user of underscore characters in usernames
-- added Spanish translation, thanks to Ernesto Revilla
-- added Dutch translation, thanks to Wilco Baan Hofman
-- applied a patch from Wilco Baan Hofman to let SOGo works correctly through a Squid proxy
+ * retrieving the freebusy DAV object was causing SOGo to crash
+ * converted to use the gnustep-make 2 build framework
+ * added custom DAV methods for managing user permissions from the SOGo Integrator
+ * pressing enter in the contact edition dialog will perform the creation/update operation
+ * implemented more of the CalDAV specification for compatibility with Lightning 0.8
+ * added Italian translation, thanks to Marco Lertora and Sauro Saltini
+ * added initial logic for splitting overlapping events
+ * improved restoration of drag handles state
+ * improved contextual menu handling of Address Book module
+ * fixed time/date control widget of attendees editor
+ * fixed various bugs occuring with Safari 3.1
+ * monthly events would not be returned properly
+ * bi-weekly events would appear every week instead
+ * weekly events with specified days of week would not appear on the correct days
+ * added support for calendar colors, both in the web and DAV interfaces
+ * refactored and fixed the implementation of DAV acl, with partial support for CalDAV Scheduling extensions
+ * removed the limitation that prevented the user of underscore characters in usernames
+ * added Spanish translation, thanks to Ernesto Revilla
+ * added Dutch translation, thanks to Wilco Baan Hofman
+ * applied a patch from Wilco Baan Hofman to let SOGo works correctly through a Squid proxy
 
 0.9.0-20080208 (1.0 rc5)
 ------------------------

diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 0c3c2a526d661e0aa8fca6ea2df0a1a467ae414b..19a022230b78f967c0c89211a3b3782102bcc53d 100644 (file)
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1758,13 +1758,14 @@ function onCalendarRemove(event) {
     for (var i = 0; i < nodes.length; i++) {
       nodes[i].deselect();
       var owner = nodes[i].getAttribute("owner");
-      if (owner != UserLogin) {
-       var folderId = nodes[i].getAttribute("id");
-       unsubscribeFromFolder(folderId, owner,
-                             onFolderUnsubscribeCB, folderId);
+      var folderId = nodes[i].getAttribute("id");
+      if (owner == UserLogin) {
+        var folderIdElements = folderId.split(":");
+       deletePersonalCalendar(folderIdElements[0]);
       }
       else
-       deletePersonalCalendar(folderIdElements[0]);
+       unsubscribeFromFolder(folderId, owner,
+                             onFolderUnsubscribeCB, folderId);
     }
   }