[CalendarServer-changes] [13452] CalendarServer/trunk/txdav/who

[source_changes at macosforge.org]

Revision: 13452
          http://trac.calendarserver.org//changeset/13452
Author:   sagen at apple.com
Date:     2014-05-06 12:06:18 -0700 (Tue, 06 May 2014)
Log Message:
-----------
Don't override acceptIfFree.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/who/directory.py
    CalendarServer/trunk/txdav/who/test/test_directory.py

Modified: CalendarServer/trunk/txdav/who/directory.py
===================================================================
--- CalendarServer/trunk/txdav/who/directory.py	2014-05-06 18:56:28 UTC (rev 13451)
+++ CalendarServer/trunk/txdav/who/directory.py	2014-05-06 19:06:18 UTC (rev 13452)
@@ -449,6 +449,7 @@
             autoScheduleMode not in
             (
                 AutoScheduleMode.accept,
+                AutoScheduleMode.acceptIfFree,
                 AutoScheduleMode.acceptIfFreeDeclineIfBusy
             )
         ):

Modified: CalendarServer/trunk/txdav/who/test/test_directory.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_directory.py	2014-05-06 18:56:28 UTC (rev 13451)
+++ CalendarServer/trunk/txdav/who/test/test_directory.py	2014-05-06 19:06:18 UTC (rev 13452)
@@ -244,8 +244,8 @@
             ),
             (
                 AutoScheduleMode.acceptIfFree,
-                AutoScheduleMode.acceptIfFreeDeclineIfBusy,
                 AutoScheduleMode.acceptIfFree,
+                AutoScheduleMode.acceptIfFree,
             ),
             (
                 AutoScheduleMode.declineIfBusy,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140506/fce586de/attachment.html>