[CalendarServer-changes] [13655] CalendarServer/branches/users/sagen/recordtypes/txdav

[source_changes at macosforge.org]

Revision: 13655
          http://trac.calendarserver.org//changeset/13655
Author:   sagen at apple.com
Date:     2014-06-18 14:03:16 -0700 (Wed, 18 Jun 2014)
Log Message:
-----------
More recordTypes args

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/recordtypes/txdav/dps/client.py
    CalendarServer/branches/users/sagen/recordtypes/txdav/who/augment.py
    CalendarServer/branches/users/sagen/recordtypes/txdav/who/delegates.py
    CalendarServer/branches/users/sagen/recordtypes/txdav/who/wiki.py

Modified: CalendarServer/branches/users/sagen/recordtypes/txdav/dps/client.py
===================================================================
--- CalendarServer/branches/users/sagen/recordtypes/txdav/dps/client.py	2014-06-18 21:02:13 UTC (rev 13654)
+++ CalendarServer/branches/users/sagen/recordtypes/txdav/dps/client.py	2014-06-18 21:03:16 UTC (rev 13655)
@@ -324,7 +324,7 @@
         )
 
 
-    def recordsFromExpression(self, expression):
+    def recordsFromExpression(self, expression, recordTypes=None):
         raise NotImplementedError(
             "This won't work until expressions are serializable to send "
             "across AMP"

Modified: CalendarServer/branches/users/sagen/recordtypes/txdav/who/augment.py
===================================================================
--- CalendarServer/branches/users/sagen/recordtypes/txdav/who/augment.py	2014-06-18 21:02:13 UTC (rev 13654)
+++ CalendarServer/branches/users/sagen/recordtypes/txdav/who/augment.py	2014-06-18 21:03:16 UTC (rev 13655)
@@ -133,8 +133,10 @@
 
 
     @inlineCallbacks
-    def recordsFromExpression(self, expression):
-        records = yield self._directory.recordsFromExpression(expression)
+    def recordsFromExpression(self, expression, recordTypes=None):
+        records = yield self._directory.recordsFromExpression(
+            expression, recordTypes=recordTypes
+        )
         augmented = []
         for record in records:
             record = yield self._augment(record)

Modified: CalendarServer/branches/users/sagen/recordtypes/txdav/who/delegates.py
===================================================================
--- CalendarServer/branches/users/sagen/recordtypes/txdav/who/delegates.py	2014-06-18 21:02:13 UTC (rev 13654)
+++ CalendarServer/branches/users/sagen/recordtypes/txdav/who/delegates.py	2014-06-18 21:03:16 UTC (rev 13655)
@@ -199,7 +199,7 @@
 
 
     @inlineCallbacks
-    def recordsFromExpression(self, expression, records=None):
+    def recordsFromExpression(self, expression, recordTypes=None, records=None):
         """
         It's only ever appropriate to look up delegate group record by
         shortName or uid.  When wrapped by an aggregate directory, looking up

Modified: CalendarServer/branches/users/sagen/recordtypes/txdav/who/wiki.py
===================================================================
--- CalendarServer/branches/users/sagen/recordtypes/txdav/who/wiki.py	2014-06-18 21:02:13 UTC (rev 13654)
+++ CalendarServer/branches/users/sagen/recordtypes/txdav/who/wiki.py	2014-06-18 21:03:16 UTC (rev 13655)
@@ -133,7 +133,7 @@
         return succeed(None)
 
 
-    def recordsFromExpression(self, expression, records=None):
+    def recordsFromExpression(self, expression, recordTypes=None, records=None):
         return succeed(())
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140618/996baff8/attachment-0001.html>