[CalendarServer-changes] [4952] ContactsServer/twistedcaldav/resource.py

source_changes at macosforge.org source_changes at macosforge.org
Thu Jan 21 12:13:03 PST 2010


Revision: 4952
          http://trac.macosforge.org/projects/calendarserver/changeset/4952
Author:   gaya at apple.com
Date:     2010-01-21 12:13:00 -0800 (Thu, 21 Jan 2010)
Log Message:
-----------
fix CalDAVResource.displayName() to return address book displayname if displayname is a dead property

Modified Paths:
--------------
    ContactsServer/twistedcaldav/resource.py

Modified: ContactsServer/twistedcaldav/resource.py
===================================================================
--- ContactsServer/twistedcaldav/resource.py	2010-01-21 19:38:46 UTC (rev 4951)
+++ ContactsServer/twistedcaldav/resource.py	2010-01-21 20:13:00 UTC (rev 4952)
@@ -454,7 +454,7 @@
     ##
 
     def displayName(self):
-        if self.isAddressBookCollection():
+        if self.isAddressBookCollection() and not self.hasDeadProperty((davxml.dav_namespace, "displayname")):
             return None
         
         if 'record' in dir(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100121/4f2524dc/attachment.html>


More information about the calendarserver-changes mailing list