See ChangeLog

Monotone-Parent: be9e28d5d42ed05605b27d2127cf29b07678495b
Monotone-Revision: 5de6a9584cf27a2c1dad8d1ab8b84fc9ddab2720

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-04-25T10:31:08
Monotone-Branch: ca.inverse.sogo

UI/MailerUI/German.lproj/Localizable.strings

@@ -165,8 +165,8 @@
 "InboxFolderName"  = "Posteingang";
 "DraftsFolderName" = "Entwürfe";
 "SieveFolderName"  = "Filter";
-"OtherUsersFolderName"   = "Other Users";
-"SharedFoldersName" = "Shared Folders";
+"Other Users" = "Andere Benutzer";
+"Shared Folders" = "Gemeinsame Ordner";
 "Folders"          = "Ordner"; /* title line */
 
 /* MailMoveToPopUp */

UI/SOGoUI/UIxComponent.m

@@ -1,14 +1,15 @@
 /*
+  Copyright (C) 2007-2011 Inverse inc.
   Copyright (C) 2004 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.

UI/SOGoUI/UIxJSClose.h

@@ -1,6 +1,6 @@
 /* UIxJSClose.h - this file is part of SOGo
  *
- * Copyright (C) 2006 Inverse inc.
+ * Copyright (C) 2006-2011 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *

UI/SOGoUI/UIxJSClose.m

@@ -1,6 +1,6 @@
 /* UIxJSClose.m - this file is part of SOGo
  *
- * Copyright (C) 2006 Inverse inc.
+ * Copyright (C) 2006-2011 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *

UI/Scheduler/UIxAppointmentEditor.m

@@ -378,6 +378,7 @@
 {
   SOGoAppointmentFolder *previousCalendar;
   SOGoAppointmentObject *co;
+  NSString *jsonResponse;
   SoSecurityManager *sm;
   NSException *ex;
 
@@ -386,6 +387,7 @@
     co = [co container];
   previousCalendar = [co container];
   sm = [SoSecurityManager sharedSecurityManager];
+  ex = nil;
 
   if ([event hasRecurrenceRules])
     [self _adjustRecurrentRules];
@@ -409,12 +411,12 @@
 	}
       
       // Save the event.
-      [co saveComponent: event];
+      ex = [co saveComponent: event];
     }
   else
     {
       // The event was modified -- save it.
-      [co saveComponent: event];
+      ex = [co saveComponent: event];
 
       if (componentCalendar
           && ![[componentCalendar ocsPath]
@@ -432,8 +434,19 @@
 	    }
 	}
     }
+
+  if (ex)
+    jsonResponse = [NSDictionary dictionaryWithObjectsAndKeys:
+				   @"failure", @"status",
+				 [ex reason],
+				 @"message",
+				 nil];
+  else
+    jsonResponse = [NSDictionary dictionaryWithObjectsAndKeys:
+				   @"success", @"status", nil];
   
-  return [self jsCloseWithRefreshMethod: @"refreshEventsAndDisplay()"];
+  return [self responseWithStatus: 200
+	       andString: [jsonResponse jsonRepresentation]];
 }
 
 - (id <WOActionResults>) viewAction

UI/Templates/SchedulerUI/UIxComponentEditor.wox

@@ -37,7 +37,7 @@
     </ul>
   </div>
 
-  <form var:href="saveURL" name="editform" onsubmit="return validateAptEditor();">
+  <form var:href="saveURL" name="editform">
     <div id="eventView">
       <label><var:string label:value="Title:" /><span class="content"
           ><input type="text" name="summary" id="summary"

UI/WebServerResources/UIxAppointmentEditor.js

@@ -96,6 +96,8 @@ function validateAptEditor() {
         }
     }
 
+    AIM.submit($(document.editform), {'onComplete' : onEventPostComplete});
+
     return true;
 }
 
@@ -176,6 +178,21 @@ function addContact(tag, fullContactName, contactId, contactName, contactEmail)
     return false;
 }
 
+function onEventPostComplete(response) {
+    if (response && response.length > 0) {
+        var jsonResponse = response.evalJSON();
+        if (jsonResponse["status"] == "success") {
+            if (window.opener)
+                window.opener.refreshEventsAndDisplay();
+            window.close();
+        }
+        else {
+            var message = jsonResponse["message"];
+            alert(jsonResponse["message"]);
+        }
+    }
+}
+
 function saveEvent(sender) {
     if (validateAptEditor()) {
         document.forms['editform'].attendees.value = Object.toJSON($(attendees));