See ChangeLogs.

Monotone-Parent: 4ada003303186187c511ea7faea08604da6b3db4
Monotone-Revision: 1e456d9a08ec90bd4e7fad4909eecfaa354aed5a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-08T15:48:55
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxCalListingActions.m

@@ -312,7 +312,7 @@ static NSArray *tasksFields = nil;
   NSNull *marker;
   SOGoAppointmentFolders *clientObject;
   SOGoUser *ownerUser;
-  NSString *owner, *role;
+  NSString *owner, *role, *calendarName;
   BOOL isErasable, folderIsRemote;
 
   infos = [NSMutableArray array];
@@ -381,7 +381,10 @@ static NSArray *tasksFields = nil;
                           forKey: @"c_folder"];
               [newInfo setObject: [currentFolder ownerInContext: context]
                           forKey: @"c_owner"];
-              [newInfo setObject: [currentFolder displayName]
+              calendarName = [currentFolder displayName];
+              if (calendarName == nil)
+                calendarName = @"";
+              [newInfo setObject: calendarName
                           forKey: @"calendarName"];
               if (![[newInfo objectForKey: @"c_title"] length])
                 [self _fixComponentTitle: newInfo withType: component];

UI/Scheduler/UIxCalendarSelector.m

@@ -1,6 +1,6 @@
 /* UIxCalendarSelector.m - this file is part of SOGo
  *
- * Copyright (C) 2007, 2008 Inverse inc.
+ * Copyright (C) 2007-2011 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -107,6 +107,8 @@ _intValueFromHex (NSString *hexString)
 	  calendar = [NSMutableDictionary dictionary];
 	  folderName = [folder nameInContainer];
 	  fDisplayName = [folder displayName];
+          if (fDisplayName == nil)
+            fDisplayName = @"";
 	  if ([fDisplayName isEqualToString: [co defaultFolderName]])
 	    fDisplayName = [self labelForKey: fDisplayName];
 	  [calendar setObject: [NSString stringWithFormat: @"/%@", folderName]

UI/WebServerResources/SchedulerUI.js

@@ -2542,7 +2542,11 @@ function updateCalendarProperties(calendarID, calendarName, calendarColor) {
 	//   log("nodeID: " + nodeID);
     var calendarNode = $(nodeID);
     var childNodes = calendarNode.childNodes;
-    childNodes[childNodes.length-1].nodeValue = calendarName;
+    var textNode = childNodes[childNodes.length-1];
+    if (textNode.tagName == 'DIV')
+        calendarNode.appendChild(document.createTextNode(calendarName));
+    else
+        childNodes[childNodes.length-1].nodeValue = calendarName;
 
     appendStyleElement(nodeID, calendarColor);
 }

UI/WebServerResources/UIxCalendarProperties.js

@@ -30,10 +30,17 @@ function onOKClick(event) {
   var originalTag = $("originalCalendarSyncTag");
   var allTags = $("allCalendarSyncTags");
 
-  if (allTags)
+  if (calendarName.value.blank()) {
+      alert(_("Please specify a calendar name."));
+      save = false;
+  }
+
+  if (save
+      && allTags)
       allTags = allTags.value.split(",");
   
-  if (tag
+  if (save
+      && tag
       && $("synchronizeCalendar").checked) {
       if (tag.value.blank()) {
           alert(_("tagNotDefined"));
@@ -52,7 +59,8 @@ function onOKClick(event) {
       else
           save = confirm(_("tagWasAdded"));
   }
-  else if (originalTag
+  else if (save
+           && originalTag
            && !originalTag.value.blank())
       save = confirm(_("tagWasRemoved"));