[CalendarServer-changes] [14101] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14101
          http://trac.calendarserver.org//changeset/14101
Author:   sagen at apple.com
Date:     2014-10-23 15:41:05 -0700 (Thu, 23 Oct 2014)
Log Message:
-----------
Get auto-schedule-mode working for LDAP

Modified Paths:
--------------
    CalendarServer/trunk/requirements-stable.txt
    CalendarServer/trunk/txdav/who/augment.py
    CalendarServer/trunk/txdav/who/util.py

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2014-10-23 22:40:08 UTC (rev 14100)
+++ CalendarServer/trunk/requirements-stable.txt	2014-10-23 22:41:05 UTC (rev 14101)
@@ -5,7 +5,7 @@
 # For CalendarServer development, don't try to get these projects from PyPI; use svn.
 
 -e .
--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14091#egg=twextpy
+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14100#egg=twextpy
 -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
 -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@14025#egg=pycalendar
 

Modified: CalendarServer/trunk/txdav/who/augment.py
===================================================================
--- CalendarServer/trunk/txdav/who/augment.py	2014-10-23 22:40:08 UTC (rev 14100)
+++ CalendarServer/trunk/txdav/who/augment.py	2014-10-23 22:41:05 UTC (rev 14101)
@@ -366,8 +366,12 @@
 
 
     def _assignToField(self, fields, name, value):
+        """
+        Assign a value to a field only if not already present in fields.
+        """
         field = self.fieldName.lookupByName(name)
-        fields[field] = value
+        if field not in fields:
+            fields[field] = value
 
 
     @inlineCallbacks

Modified: CalendarServer/trunk/txdav/who/util.py
===================================================================
--- CalendarServer/trunk/txdav/who/util.py	2014-10-23 22:40:08 UTC (rev 14100)
+++ CalendarServer/trunk/txdav/who/util.py	2014-10-23 22:41:05 UTC (rev 14101)
@@ -146,6 +146,7 @@
                     CalFieldName.readOnlyProxy: mapping.readOnlyProxy,
                     CalFieldName.readWriteProxy: mapping.readWriteProxy,
                     CalFieldName.hasCalendars: mapping.hasCalendars,
+                    CalFieldName.autoScheduleMode: mapping.autoScheduleMode,
                 }),
                 recordTypeSchemas=MappingProxyType({
                     RecordType.user: RecordTypeSchema(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20141023/b0585367/attachment.html>