<!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>[13128] CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory</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/13128">13128</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-02 13:30:54 -0700 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't list children of /addressbooks/ and /calendars/ which don't apply.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectoryaddressbookpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/addressbook.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorycalendarpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectoryaddressbookpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/addressbook.py (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/addressbook.py 2014-04-02 19:13:50 UTC (rev 13127)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/addressbook.py 2014-04-02 20:30:54 UTC (rev 13128)
</span><span class="lines">@@ -100,19 +100,32 @@
</span><span class="cx"> # FIXME: Smells like a hack
</span><span class="cx"> directory.addressBookHomesCollection = self
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # Create children
</span><span class="cx"> #
</span><del>- # ...just "users" though. If we iterate all of the directory's
- # recordTypes, we also get the proxy sub principal types.
</del><ins>+ # ...just users, locations, and resources though. If we iterate all of
+ # the directory's recordTypes, we also get the proxy sub principal types
+ # and other things which don't have addressbooks.
+
+ self.supportedChildTypes = (
+ self.directory.recordType.user,
+ self.directory.recordType.location,
+ self.directory.recordType.resource,
+ )
+
</ins><span class="cx"> for recordTypeName in [
</span><del>- self.directory.recordTypeToOldName(r) for r in [
- self.directory.recordType.user
- ]
</del><ins>+ self.directory.recordTypeToOldName(r) for r in
+ self.supportedChildTypes
</ins><span class="cx"> ]:
</span><span class="cx"> # FIXME: why don't we also pass in the name to the resource itself
</span><span class="cx"> # like we do for DirectoryCalendarHomeTypeProvisioningResource?
</span><del>- self.putChild(recordTypeName, DirectoryAddressBookHomeTypeProvisioningResource(self, r))
</del><ins>+ self.putChild(
+ recordTypeName,
+ DirectoryAddressBookHomeTypeProvisioningResource(
+ self, recordTypeName, r
+ )
+ )
</ins><span class="cx">
</span><span class="cx"> self.putChild(uidsResourceName, DirectoryAddressBookHomeUIDProvisioningResource(self))
</span><span class="cx">
</span><span class="lines">@@ -122,7 +135,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def listChildren(self):
</span><del>- return [self.directory.recordTypeToOldName(r) for r in self.directory.recordTypes()]
</del><ins>+ return [
+ self.directory.recordTypeToOldName(r) for r in
+ self.supportedChildTypes
+ ]
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def principalCollections(self):
</span><span class="lines">@@ -167,23 +183,25 @@
</span><span class="cx"> Resource which provisions address book home collections of a specific
</span><span class="cx"> record type as needed.
</span><span class="cx"> """
</span><del>- def __init__(self, parent, recordType):
</del><ins>+ def __init__(self, parent, name, recordType):
</ins><span class="cx"> """
</span><span class="cx"> @param parent: the parent of this resource
</span><span class="cx"> @param recordType: the directory record type to provision.
</span><span class="cx"> """
</span><span class="cx"> assert parent is not None
</span><ins>+ assert name is not None
</ins><span class="cx"> assert recordType is not None
</span><span class="cx">
</span><span class="cx"> super(DirectoryAddressBookHomeTypeProvisioningResource, self).__init__()
</span><span class="cx">
</span><span class="cx"> self.directory = parent.directory
</span><ins>+ self.name = name
</ins><span class="cx"> self.recordType = recordType
</span><span class="cx"> self._parent = parent
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def url(self):
</span><del>- return joinURL(self._parent.url(), self.directory.recordTypeToOldName(self.recordType))
</del><ins>+ return joinURL(self._parent.url(), self.name)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorycalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py 2014-04-02 19:13:50 UTC (rev 13127)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py 2014-04-02 20:30:54 UTC (rev 13128)
</span><span class="lines">@@ -104,14 +104,26 @@
</span><span class="cx"> #
</span><span class="cx"> # Create children
</span><span class="cx"> #
</span><del>- # ...just "users" though. If we iterate all of the directory's
- # recordTypes, we also get the proxy sub principal types.
</del><ins>+ # ...just users, locations, and resources though. If we iterate all of
+ # the directory's recordTypes, we also get the proxy sub principal types
+ # and other things which don't have calendars.
+
+ self.supportedChildTypes = (
+ self.directory.recordType.user,
+ self.directory.recordType.location,
+ self.directory.recordType.resource,
+ )
+
</ins><span class="cx"> for recordTypeName in [
</span><del>- self.directory.recordTypeToOldName(r) for r in [
- self.directory.recordType.user
- ]
</del><ins>+ self.directory.recordTypeToOldName(r) for r in
+ self.supportedChildTypes
</ins><span class="cx"> ]:
</span><del>- self.putChild(recordTypeName, DirectoryCalendarHomeTypeProvisioningResource(self, recordTypeName, r))
</del><ins>+ self.putChild(
+ recordTypeName,
+ DirectoryCalendarHomeTypeProvisioningResource(
+ self, recordTypeName, r
+ )
+ )
</ins><span class="cx">
</span><span class="cx"> self.putChild(uidsResourceName, DirectoryCalendarHomeUIDProvisioningResource(self))
</span><span class="cx">
</span><span class="lines">@@ -121,7 +133,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def listChildren(self):
</span><del>- return [self.directory.recordTypeToOldName(r) for r in self.directory.recordTypes()]
</del><ins>+ return [
+ self.directory.recordTypeToOldName(r) for r in
+ self.supportedChildTypes
+ ]
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def principalCollections(self):
</span></span></pre>
</div>
</div>
</body>
</html>