[CalendarServer-changes] [13974] CalendarServer/branches/release/CalendarServer-6.0-dev/ twistedcaldav/storebridge.py

[source_changes at macosforge.org]

Revision: 13974
          http://trac.calendarserver.org//changeset/13974
Author:   cdaboo at apple.com
Date:     2014-09-17 15:02:35 -0700 (Wed, 17 Sep 2014)
Log Message:
-----------
Make sure crud POST update with return-changed works.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-6.0-dev/twistedcaldav/storebridge.py

Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.0-dev/twistedcaldav/storebridge.py	2014-09-17 18:30:19 UTC (rev 13973)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/twistedcaldav/storebridge.py	2014-09-17 22:02:35 UTC (rev 13974)
@@ -877,6 +877,7 @@
                     raise HTTPError(PRECONDITION_FAILED)
 
                 changedComponent = yield self.storeResourceData(updateResource, component, returnChangedData=return_changed)
+                etag = (yield updateResource.etag())
 
             except HTTPError, e:
                 # Extract the pre-condition
@@ -905,7 +906,7 @@
                         davxml.PropertyStatus(
                             davxml.PropertyContainer(
                                 davxml.GETETag.fromString(etag.generate()),
-                                self.xmlDataElementType().fromComponentData(changedComponent, format),
+                                self.xmlDataElementType().fromComponent(changedComponent, format),
                             ),
                             davxml.Status.fromResponseCode(OK),
                         )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140917/799862e4/attachment.html>