[CalendarServer-changes] [562] CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/ directory/resource.py

[source_changes at macosforge.org]

Revision: 562
          http://trac.macosforge.org/projects/calendarserver/changeset/562
Author:   wsanchez at apple.com
Date:     2006-11-22 13:59:11 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
Fall back to short name if display name is uninteresting.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/resource.py

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/resource.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/resource.py	2006-11-22 21:48:47 UTC (rev 561)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/resource.py	2006-11-22 21:59:11 UTC (rev 562)
@@ -235,6 +235,16 @@
         return response
 
     ##
+    # DAV
+    ##
+
+    def displayName(self):
+        if self.record.fullName:
+            return self.record.fullName
+        else:
+            return self.record.shortName
+
+    ##
     # ACL
     ##
 
@@ -269,9 +279,6 @@
     def groupMemberships(self):
         return self._getRelatives("groups")
 
-    def displayName(self):
-        return self.record.fullName
-
     ##
     # CalDAV
     ##

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061122/d6abbef9/attachment.html