[CalendarServer-changes] [4999] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 4999
          http://trac.macosforge.org/projects/calendarserver/changeset/4999
Author:   cdaboo at apple.com
Date:     2010-02-01 13:15:44 -0800 (Mon, 01 Feb 2010)
Log Message:
-----------
Make sync report work with client requested properties.

Modified Paths:
--------------
    CalendarServer/trunk/twext/web2/dav/davxml.py
    CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py

Modified: CalendarServer/trunk/twext/web2/dav/davxml.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/davxml.py	2010-02-01 21:13:48 UTC (rev 4998)
+++ CalendarServer/trunk/twext/web2/dav/davxml.py	2010-02-01 21:15:44 UTC (rev 4999)
@@ -155,7 +155,7 @@
             elif qname in (
                 (dav_namespace, "prop"    ),
             ):
-                if property is not None:
+                if self.property is not None:
                     raise ValueError("Only one of DAV:prop allowed")
                 self.property = child
 

Modified: CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py	2010-02-01 21:13:48 UTC (rev 4998)
+++ CalendarServer/trunk/twistedcaldav/method/report_sync_collection.py	2010-02-01 21:15:44 UTC (rev 4999)
@@ -51,7 +51,7 @@
    
     responses = []
 
-    propertyreq = sync_collection.property
+    propertyreq = sync_collection.property.children if sync_collection.property else None 
     
     @inlineCallbacks
     def _namedPropertiesForResource(request, props, resource, forbidden=False):
@@ -91,7 +91,7 @@
                 else:
                     properties_by_status[responsecode.NOT_FOUND].append(propertyName(qname))
         
-        yield properties_by_status
+        returnValue(properties_by_status)
     
     # Do some optimization of access control calculation by determining any inherited ACLs outside of
     # the child resource loop and supply those to the checkPrivileges on each child.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100201/930045ca/attachment.html>