[CalendarServer-changes] [4180] CalendarServer/trunk/twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 4180
          http://trac.macosforge.org/projects/calendarserver/changeset/4180
Author:   sagen at apple.com
Date:     2009-05-05 16:03:59 -0700 (Tue, 05 May 2009)
Log Message:
-----------
Resources/locations default to auto-schedule

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/principal.py
    CalendarServer/trunk/twistedcaldav/directory/resourceinfo.py

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2009-05-05 20:36:43 UTC (rev 4179)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2009-05-05 23:03:59 UTC (rev 4180)
@@ -759,8 +759,21 @@
     def setAutoSchedule(self, autoSchedule):
         self._resource_info_index().setAutoSchedule(self.record.guid, autoSchedule)
 
+    @inlineCallbacks
     def getAutoSchedule(self):
-        return self._resource_info_index().getAutoSchedule(self.record.guid)
+        value = (yield self._resource_info_index().getAutoSchedule(self.record.guid))
+        if value is None:
+            # No value has been explicitly set yet.  If this is a user/group
+            # the default should be False.  If resource/location, True.
+            if self.record.recordType in (DirectoryService.recordType_locations,
+                DirectoryService.recordType_resources):
+                yield self.setAutoSchedule(True)
+                returnValue(True)
+            else:
+                yield self.setAutoSchedule(False)
+                returnValue(False)
+        else:
+            returnValue(value)
 
 
     def _resource_info_index(self):

Modified: CalendarServer/trunk/twistedcaldav/directory/resourceinfo.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/resourceinfo.py	2009-05-05 20:36:43 UTC (rev 4179)
+++ CalendarServer/trunk/twistedcaldav/directory/resourceinfo.py	2009-05-05 23:03:59 UTC (rev 4180)
@@ -105,11 +105,6 @@
             if autoSchedule is not None:
                 autoSchedule = autoSchedule == 1
                 result = (yield self._memcacher.setAutoSchedule(guid, autoSchedule))
-            else:
-                # Not in local db
-                # Default to False
-                autoSchedule = False
-
         returnValue(autoSchedule)
 
     def _add_to_db(self, guid, autoSchedule):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090505/47f456a7/attachment-0001.html>