[CalendarServer-changes] [14736] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14736
          http://trac.calendarserver.org//changeset/14736
Author:   cdaboo at apple.com
Date:     2015-05-04 07:24:01 -0700 (Mon, 04 May 2015)
Log Message:
-----------
DAV:displayname no longer defaults to path name.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-dev.txt
    CalendarServer/trunk/twistedcaldav/method/propfind.py
    CalendarServer/trunk/twistedcaldav/resource.py

Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- CalendarServer/trunk/requirements-dev.txt	2015-05-04 14:22:24 UTC (rev 14735)
+++ CalendarServer/trunk/requirements-dev.txt	2015-05-04 14:24:01 UTC (rev 14736)
@@ -8,4 +8,4 @@
 q
 tl.eggdeps
 --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14724#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14735#egg=CalDAVTester

Modified: CalendarServer/trunk/twistedcaldav/method/propfind.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/propfind.py	2015-05-04 14:22:24 UTC (rev 14735)
+++ CalendarServer/trunk/twistedcaldav/method/propfind.py	2015-05-04 14:24:01 UTC (rev 14736)
@@ -155,7 +155,7 @@
 
     for respcode, resource, uri in resources:
         if respcode == responsecode.OK:
-            if search_properties is "names":
+            if search_properties == "names":
                 try:
                     resource_properties = (yield resource.listProperties(request))
                 except:
@@ -171,7 +171,7 @@
                     responsecode.NOT_FOUND : [],
                 }
 
-                if search_properties is "all":
+                if search_properties == "all":
                     properties_to_enumerate = (yield resource.listAllprop(request))
                 else:
                     properties_to_enumerate = search_properties
@@ -191,9 +191,9 @@
                         else:
                             if resource_property is not None:
                                 properties_by_status[responsecode.OK].append(resource_property)
-                            elif not returnMinimal:
+                            elif not returnMinimal and search_properties != "all":
                                 properties_by_status[responsecode.NOT_FOUND].append(propertyName(property))
-                    elif not returnMinimal:
+                    elif not returnMinimal and search_properties != "all":
                         properties_by_status[responsecode.NOT_FOUND].append(propertyName(property))
 
             propstats = []

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2015-05-04 14:22:24 UTC (rev 14735)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2015-05-04 14:24:01 UTC (rev 14736)
@@ -868,23 +868,15 @@
     ##
 
     def displayName(self):
-        if self.isAddressBookCollection() and not self.hasDeadProperty((dav_namespace, "displayname")):
-            return None
-
         if 'record' in dir(self):
             if self.record.fullNames:
                 return self.record.fullNames[0]
             elif self.record.shortNames:
                 return self.record.shortNames[0]
-            else:
-                return super(DAVResource, self).displayName()
-        else:
-            result = super(DAVResource, self).displayName()
-            if not result:
-                result = self.name()
-            return result
 
+        return super(DAVResource, self).displayName()
 
+
     def name(self):
         return None
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150504/94810ed7/attachment.html>