bugfixes

UI/Scheduler/UIxCalListingActions.m

@@ -1051,7 +1051,7 @@ _computeBlocksPosition (NSArray *blocks)
   SOGoAppointmentFolder *folder;
   NSMutableArray *selectedCalendars;
   NSArray *folders;
-  NSString *fDisplayName;
+  NSString *fUID;
   NSNumber *isActive;
   unsigned int count, foldersCount;
   int max=0, i;
@@ -1065,12 +1065,8 @@ _computeBlocksPosition (NSArray *blocks)
     folder = [folders objectAtIndex: count];
     isActive = [NSNumber numberWithBool: [folder isActive]];
     if ([isActive intValue] != 0) {
-      fDisplayName = [folder displayName];
-      if (fDisplayName == nil)
-        fDisplayName = @"";
-      if ([fDisplayName isEqualToString: [co defaultFolderName]])
-        fDisplayName = [self labelForKey: fDisplayName];
-      [selectedCalendars addObject: fDisplayName];
+      fUID = [folder nameInContainer];
+      [selectedCalendars addObject: fUID];
     }
   }
   return selectedCalendars;
@@ -1098,7 +1094,7 @@ _computeBlocksPosition (NSArray *blocks)
       eventsForCalendar = [NSMutableArray array];
       [self _prepareEventBlocks: &blocks withAllDays: &allDayBlocks];
       for (j = 0; j < [events count]; j++) {
-        if ([[[events objectAtIndex:j] objectAtIndex:2] isEqualToString:[calendars objectAtIndex:i]]) {
+        if ([[[events objectAtIndex:j] objectAtIndex:1] isEqualToString:[calendars objectAtIndex:i]]) {
           [eventsForCalendar addObject: [events objectAtIndex:j]];
         }
       }

UI/WebServerResources/SchedulerUI.js

@@ -417,13 +417,14 @@ function deleteEvent() {
 }
 
 function deleteEventFromListConfirm() {
-    if (document.deleteEventAjaxRequest) {
-        document.deleteEventAjaxRequest.aborted = true;
-        document.deleteEventAjaxRequest.abort();
-    }
-
-    _batchDeleteEvents();
-    disposeDialog();
+  if (document.deleteEventAjaxRequest) {
+    document.deleteEventAjaxRequest.aborted = true;
+    document.deleteEventAjaxRequest.abort();
+  }
+  
+  _batchDeleteEvents();
+  refreshTasks();
+  disposeDialog();
 }
 
 function deleteEventFromViewConfirm() {

UI/WebServerResources/UIxCalViewPrint.js

@@ -123,15 +123,20 @@ function previewDisplayCallback(http) {
 }
 
 function addCalendarsColor () {
-  var activeCalendarsId = [];
   var allCalendars = window.parent$("calendarList");
   var allColors = window.parentvar("UserSettings")['Calendar']['FolderColors'];
+  
   for (var i = 0; i < allCalendars.children.length; i++) {
     if (allCalendars.children[i].down("input").checked){
+      owner = allCalendars.children[i].getAttribute("owner");
       folderName = allCalendars.children[i].getAttribute("id").substr(1);
-      color = allColors["sogo1:Calendar/" + folderName];
+     
+      color = allColors[owner + ":Calendar/" + folderName];
       if (!color) {
-        color = "#AAAAAA";
+        if(folderName.split("_")[1])
+          color = allColors[owner + ":Calendar/" + folderName.split("_")[1]];
+        else
+          color = "#AAAAAA";
       }
       appendStyleElement(folderName, color);
     }