[CalendarServer-changes] [10811] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 10811
          http://trac.calendarserver.org//changeset/10811
Author:   cdaboo at apple.com
Date:     2013-02-26 07:31:55 -0800 (Tue, 26 Feb 2013)
Log Message:
-----------
Add config option for future time-range scan when doing auto-accept. Now defaults to 3 years in the future.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/scheduling/processing.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/twistedcaldav/scheduling/processing.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/processing.py	2013-02-26 15:31:16 UTC (rev 10810)
+++ CalendarServer/trunk/twistedcaldav/scheduling/processing.py	2013-02-26 15:31:55 UTC (rev 10811)
@@ -761,7 +761,7 @@
         cuas = self.recipient.principal.calendarUserAddresses()
 
         # First expand current one to get instances (only go 1 year into the future)
-        default_future_expansion_duration = PyCalendarDuration(days=365)
+        default_future_expansion_duration = PyCalendarDuration(days=config.Scheduling.Options.AutoSchedule.FutureFreeBusyDays)
         expand_max = PyCalendarDateTime.getToday() + default_future_expansion_duration
         instances = calendar.expandTimeRanges(expand_max, ignoreInvalidInstances=True)
 

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2013-02-26 15:31:16 UTC (rev 10810)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2013-02-26 15:31:55 UTC (rev 10811)
@@ -717,6 +717,7 @@
                                                                    # "accept-if-free"  - accept if free, do nothing if busy
                                                                    # "decline-if-busy" - decline if busy, do nothing if free
                                                                    # "automatic"       - accept if free, decline if busy
+                "FutureFreeBusyDays"              : 3 * 365,       # How far into the future to check for booking conflicts
             }
         }
     },
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130226/0bf02cdc/attachment.html>