[CalendarServer-changes] [2849] CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav

[source_changes at macosforge.org]

Revision: 2849
          http://trac.macosforge.org/projects/calendarserver/changeset/2849
Author:   cdaboo at apple.com
Date:     2008-08-24 10:20:49 -0700 (Sun, 24 Aug 2008)
Log Message:
-----------
Make sure any updated calendar data is the data actually written during an implicit schedule PUT.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/method/put_common.py
    CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/scheduling/implicit.py

Modified: CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/method/put_common.py	2008-08-24 02:38:38 UTC (rev 2848)
+++ CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/method/put_common.py	2008-08-24 17:20:49 UTC (rev 2849)
@@ -682,8 +682,10 @@
             # Do scheduling
             if not self.isiTIP and self.allowImplicitSchedule:
                 scheduler = ImplicitScheduler()
-                self.calendar = (yield scheduler.doImplicitScheduling(self.request, self.destination, self.calendar, False))
-                self.calendardata = str(self.calendar)
+                new_calendar = (yield scheduler.doImplicitScheduling(self.request, self.destination, self.calendar, False))
+                if new_calendar:
+                    self.calendar = new_calendar
+                    self.calendardata = str(self.calendar)
 
             # Initialize the rollback system
             self.setupRollback()

Modified: CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/scheduling/implicit.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/scheduling/implicit.py	2008-08-24 02:38:38 UTC (rev 2848)
+++ CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/scheduling/implicit.py	2008-08-24 17:20:49 UTC (rev 2849)
@@ -60,7 +60,8 @@
         @param deleting: C{True} if the resource is being deleting
         @type deleting: bool
 
-        @return: a new calendar object modified with scheduling information
+        @return: a new calendar object modified with scheduling information,
+            or C{None} if nothing happened
         """
         
         self.request = request
@@ -81,6 +82,8 @@
             yield self.doImplicitOrganizer()
         elif self.isAttendeeScheduling():
             yield self.doImplicitAttendee()
+        else:
+            returnValue(None)
 
         returnValue(self.calendar)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080824/0c50286a/attachment.html