[CalendarServer-changes] [7216] CalendarServer/trunk/twistedcaldav/scheduling/implicit.py

source_changes at macosforge.org source_changes at macosforge.org
Fri Mar 18 08:25:25 PDT 2011


Revision: 7216
          http://trac.macosforge.org/projects/calendarserver/changeset/7216
Author:   cdaboo at apple.com
Date:     2011-03-18 08:25:25 -0700 (Fri, 18 Mar 2011)
Log Message:
-----------
Fix store of event with no matching organizer/attendee but with SCHEDULE-AGENT on organizer.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/scheduling/implicit.py

Modified: CalendarServer/trunk/twistedcaldav/scheduling/implicit.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/implicit.py	2011-03-18 15:23:00 UTC (rev 7215)
+++ CalendarServer/trunk/twistedcaldav/scheduling/implicit.py	2011-03-18 15:25:25 UTC (rev 7216)
@@ -905,8 +905,11 @@
             # We will allow the attendee to do anything in this case, but we will mark the organizer
             # with an schedule-status error and schedule-agent none
             log.debug("Missing attendee is allowed to update UID: '%s' with invalid organizer '%s'" % (self.uid, self.organizer))
-            self.calendar.setParameterToValueForPropertyWithValue("SCHEDULE-AGENT", "NONE", "ORGANIZER", None)
-            self.calendar.setParameterToValueForPropertyWithValue("SCHEDULE-STATUS", iTIPRequestStatus.NO_USER_SUPPORT_CODE, "ORGANIZER", None)
+            
+            # Check SCHEDULE-AGENT and coerce SERVER to NONE
+            if self.calendar.getOrganizerScheduleAgent():
+                self.calendar.setParameterToValueForPropertyWithValue("SCHEDULE-AGENT", "NONE", "ORGANIZER", None)
+                self.calendar.setParameterToValueForPropertyWithValue("SCHEDULE-STATUS", iTIPRequestStatus.NO_USER_SUPPORT_CODE, "ORGANIZER", None)
             returnValue(None)
 
     def checkOrganizerScheduleAgent(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110318/17202d36/attachment.html>


More information about the calendarserver-changes mailing list