[CalendarServer-changes] [13149] CalendarServer/branches/users/sagen/move2who-4
source_changes at macosforge.org
source_changes at macosforge.org
Thu Apr 3 16:44:06 PDT 2014
Revision: 13149
http://trac.calendarserver.org//changeset/13149
Author: sagen at apple.com
Date: 2014-04-03 16:44:05 -0700 (Thu, 03 Apr 2014)
Log Message:
-----------
remove last references to autoSchedule (now superceded by autoScheduleMode)
Modified Paths:
--------------
CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py
CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py
Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py 2014-04-03 23:21:46 UTC (rev 13148)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/resources.py 2014-04-03 23:44:05 UTC (rev 13149)
@@ -247,7 +247,10 @@
guid, recordType
)
)
- augmentRecord.autoSchedule = autoSchedule
+ if autoSchedule:
+ augmentRecord.autoScheduleMode = "automatic"
+ else:
+ augmentRecord.autoScheduleMode = "none"
augmentRecords.append(augmentRecord)
directoryRecords.append((
Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py 2014-04-03 23:21:46 UTC (rev 13148)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py 2014-04-03 23:44:05 UTC (rev 13149)
@@ -1122,24 +1122,6 @@
return self.record.thisServer()
- ##
- # Extra resource info
- ##
-
- @inlineCallbacks
- def setAutoSchedule(self, autoSchedule):
- self.record.autoSchedule = autoSchedule
- augmentRecord = (yield self.record.service.augmentService.getAugmentRecord(self.record.guid, self.record.recordType))
- augmentRecord.autoSchedule = autoSchedule
- (yield self.record.service.augmentService.addAugmentRecords([augmentRecord]))
-
-
- def getAutoSchedule(self):
- # MOVE2WHO
- return True
- # return self.record.autoSchedule
-
-
def canAutoSchedule(self, organizer=None):
"""
Determine the auto-schedule state based on record state, type and config settings.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140403/91a8dfc1/attachment-0001.html>
More information about the calendarserver-changes
mailing list