[CalendarServer-changes] [11338] CalendarServer/trunk/txdav/caldav/datastore/scheduling

[source_changes at macosforge.org]

Revision: 11338
          http://trac.calendarserver.org//changeset/11338
Author:   cdaboo at apple.com
Date:     2013-06-13 13:20:14 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
Ensure that auto-accept does not happen during attendee refresh processing.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py	2013-06-13 20:19:11 UTC (rev 11337)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py	2013-06-13 20:20:14 UTC (rev 11338)
@@ -980,7 +980,7 @@
                 continue
 
             # If SCHEDULE-FORCE-SEND only change, only send message to those Attendees
-            if self.reinvites and attendee in self.reinvites:
+            if self.reinvites and attendee not in self.reinvites:
                 continue
 
             itipmsg = iTipGenerator.generateAttendeeRequest(self.calendar, (attendee,), self.changed_rids)

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py	2013-06-13 20:19:11 UTC (rev 11337)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py	2013-06-13 20:20:14 UTC (rev 11338)
@@ -536,7 +536,7 @@
 
                 # Handle auto-reply behavior
                 organizer = normalizeCUAddr(self.message.getOrganizer())
-                if self.recipient.principal.canAutoSchedule(organizer=organizer):
+                if self.recipient.principal.canAutoSchedule(organizer=organizer) and not hasattr(self.txn, "doing_attendee_refresh"):
                     # auto schedule mode can depend on who the organizer is
                     mode = self.recipient.principal.getAutoScheduleMode(organizer=organizer)
                     send_reply, store_inbox, partstat = (yield self.checkAttendeeAutoReply(new_calendar, mode))
@@ -751,7 +751,7 @@
         expand_max = PyCalendarDateTime.getToday() + default_future_expansion_duration
         instances = calendar.expandTimeRanges(expand_max, ignoreInvalidInstances=True)
 
-        # We are goin g to ignore auto-accept processing for anything more than a day old (actually use -2 days
+        # We are going to ignore auto-accept processing for anything more than a day old (actually use -2 days
         # to add some slop to account for possible timezone offsets)
         min_date = PyCalendarDateTime.getToday()
         min_date.offsetDay(-2)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130613/d3efb2e7/attachment.html>