<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14736] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14736">14736</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-04 07:24:01 -0700 (Mon, 04 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>DAV:displayname no longer defaults to path name.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodpropfindpy">CalendarServer/trunk/twistedcaldav/method/propfind.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (14735 => 14736)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> q
</span><span class="cx"> tl.eggdeps
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14724#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14735#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodpropfindpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/propfind.py (14735 => 14736)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> for respcode, resource, uri in resources:
</span><span class="cx"> if respcode == responsecode.OK:
</span><del>- if search_properties is "names":
</del><ins>+ if search_properties == "names":
</ins><span class="cx"> try:
</span><span class="cx"> resource_properties = (yield resource.listProperties(request))
</span><span class="cx"> except:
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> responsecode.NOT_FOUND : [],
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if search_properties is "all":
</del><ins>+ if search_properties == "all":
</ins><span class="cx"> properties_to_enumerate = (yield resource.listAllprop(request))
</span><span class="cx"> else:
</span><span class="cx"> properties_to_enumerate = search_properties
</span><span class="lines">@@ -191,9 +191,9 @@
</span><span class="cx"> else:
</span><span class="cx"> if resource_property is not None:
</span><span class="cx"> properties_by_status[responsecode.OK].append(resource_property)
</span><del>- elif not returnMinimal:
</del><ins>+ elif not returnMinimal and search_properties != "all":
</ins><span class="cx"> properties_by_status[responsecode.NOT_FOUND].append(propertyName(property))
</span><del>- elif not returnMinimal:
</del><ins>+ elif not returnMinimal and search_properties != "all":
</ins><span class="cx"> properties_by_status[responsecode.NOT_FOUND].append(propertyName(property))
</span><span class="cx">
</span><span class="cx"> propstats = []
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (14735 => 14736)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -868,23 +868,15 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> def displayName(self):
</span><del>- if self.isAddressBookCollection() and not self.hasDeadProperty((dav_namespace, "displayname")):
- return None
-
</del><span class="cx"> if 'record' in dir(self):
</span><span class="cx"> if self.record.fullNames:
</span><span class="cx"> return self.record.fullNames[0]
</span><span class="cx"> elif self.record.shortNames:
</span><span class="cx"> return self.record.shortNames[0]
</span><del>- else:
- return super(DAVResource, self).displayName()
- else:
- result = super(DAVResource, self).displayName()
- if not result:
- result = self.name()
- return result
</del><span class="cx">
</span><ins>+ return super(DAVResource, self).displayName()
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def name(self):
</span><span class="cx"> return None
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>