[CalendarServer-changes] [15016] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 15016
          http://trac.calendarserver.org//changeset/15016
Author:   sagen at apple.com
Date:     2015-07-29 14:21:59 -0700 (Wed, 29 Jul 2015)
Log Message:
-----------
Support street address in OD for addressbook-query

Modified Paths:
--------------
    CalendarServer/trunk/requirements-stable.txt
    CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py
    CalendarServer/trunk/txdav/who/opendirectory.py

Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- CalendarServer/trunk/requirements-stable.txt	2015-07-29 21:20:17 UTC (rev 15015)
+++ CalendarServer/trunk/requirements-stable.txt	2015-07-29 21:21:59 UTC (rev 15016)
@@ -36,7 +36,7 @@
             #pyOpenSSL
         pycrypto==2.6.1
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14960#egg=twextpy
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15015#egg=twextpy
         cffi==1.1.0
             pycparser==2.13
         #twisted

Modified: CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py	2015-07-29 21:20:17 UTC (rev 15015)
+++ CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py	2015-07-29 21:21:59 UTC (rev 15016)
@@ -175,7 +175,7 @@
             "UID": FieldName.uid,
             "ADR": (
                 CalFieldName.streetAddress,
-                CalFieldName.floor,
+                # CalFieldName.floor,
             ),
             "KIND": FieldName.recordType,
             # LATER "X-ADDRESSBOOKSERVER-MEMBER": FieldName.membersUIDs,

Modified: CalendarServer/trunk/txdav/who/opendirectory.py
===================================================================
--- CalendarServer/trunk/txdav/who/opendirectory.py	2015-07-29 21:20:17 UTC (rev 15015)
+++ CalendarServer/trunk/txdav/who/opendirectory.py	2015-07-29 21:21:59 UTC (rev 15016)
@@ -36,3 +36,8 @@
 
 _ODRecordType.place.recordType = _CSRecordType.location     # Use dsRecTypeStandard:Places for calendar locations
 _ODRecordType.resource.recordType = _CSRecordType.resource
+
+from twext.who.opendirectory._constants import ODAttribute as _ODAttribute
+from .idirectory import FieldName as _CSFieldName
+
+_ODAttribute.streetAddress.fieldName = _CSFieldName.streetAddress
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150729/e8b8be93/attachment.html>