[CalendarServer-changes] [13148] CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/ directory/principal.py

[source_changes at macosforge.org]

Revision: 13148
          http://trac.calendarserver.org//changeset/13148
Author:   sagen at apple.com
Date:     2014-04-03 16:21:46 -0700 (Thu, 03 Apr 2014)
Log Message:
-----------
Fix resource-id

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py

Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py	2014-04-03 22:54:02 UTC (rev 13147)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py	2014-04-03 23:21:46 UTC (rev 13148)
@@ -783,8 +783,7 @@
             (calendarserver_namespace, "first-name"),
             (calendarserver_namespace, "last-name"),
             (calendarserver_namespace, "email-address-set"),
-            # MOVE2WHO
-            # davxml.ResourceID.qname(),
+            davxml.ResourceID.qname(),
         )
 
     cacheNotifierFactory = DisabledCacheNotifier
@@ -853,11 +852,13 @@
 
         namespace, name = qname
 
-        # MOVE2WHO -- does principal need ResourceID ?
-        # if qname == davxml.ResourceID.qname():
-        #     returnValue(davxml.ResourceID(davxml.HRef.fromString("urn:uuid:%s" % (self.record.guid,))))
-        if namespace == calendarserver_namespace:
+        if qname == davxml.ResourceID.qname():
+            # FIXME: should this return a different CUA flavor if guid is not set on this record?
+            if hasattr(self.record, "guid"):
+                returnValue(davxml.ResourceID(davxml.HRef.fromString("urn:uuid:%s" % (self.record.guid,))))
 
+        elif namespace == calendarserver_namespace:
+
             # MOVE2WHO
             # if name == "first-name":
             #     firstName = self.record.firstName
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140403/b475c8e8/attachment.html>