<!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>[13120] 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/13120">13120</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-02 11:22:48 -0700 (Wed, 02 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Update attribute names</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>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorycommonpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/common.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 (13119 => 13120)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/addressbook.py        2014-04-02 18:22:36 UTC (rev 13119)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/addressbook.py        2014-04-02 18:22:48 UTC (rev 13120)
</span><span class="lines">@@ -110,6 +110,8 @@
</span><span class="cx">                 self.directory.recordType.user
</span><span class="cx">             ]
</span><span class="cx">         ]:
</span><ins>+            # FIXME: why don't we also pass in the name to the resource itself
+            # like we do for DirectoryCalendarHomeTypeProvisioningResource?
</ins><span class="cx">             self.putChild(recordTypeName, DirectoryAddressBookHomeTypeProvisioningResource(self, r))
</span><span class="cx"> 
</span><span class="cx">         self.putChild(uidsResourceName, DirectoryAddressBookHomeUIDProvisioningResource(self))
</span><span class="lines">@@ -191,7 +193,7 @@
</span><span class="cx">             for record in (
</span><span class="cx">                 yield self.directory.recordsWithRecordType(self.recordType)
</span><span class="cx">             ):
</span><del>-                if record.enabledForAddressBooks:
</del><ins>+                if getattr(record, &quot;hasContacts&quot;, False):
</ins><span class="cx">                     for shortName in record.shortNames:
</span><span class="cx">                         children.append(shortName)
</span><span class="cx"> 
</span><span class="lines">@@ -214,7 +216,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def displayName(self):
</span><del>-        return self.recordType
</del><ins>+        return self.directory.recordTypeToOldName(self.recordType)
</ins><span class="cx"> 
</span><span class="cx">     ##
</span><span class="cx">     # ACL
</span><span class="lines">@@ -237,7 +239,7 @@
</span><span class="cx"> 
</span><span class="cx">     homeResourceTypeName = 'addressbooks'
</span><span class="cx"> 
</span><del>-    enabledAttribute = 'enabledForAddressBooks'
</del><ins>+    enabledAttribute = 'hasContacts'
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def homeResourceCreator(self, record, transaction):
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorycalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py (13119 => 13120)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py        2014-04-02 18:22:36 UTC (rev 13119)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py        2014-04-02 18:22:48 UTC (rev 13120)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> 
</span><span class="cx">     homeResourceTypeName = 'calendars'
</span><span class="cx"> 
</span><del>-    enabledAttribute = 'enabledForCalendaring'
</del><ins>+    enabledAttribute = 'hasCalendars'
</ins><span class="cx"> 
</span><span class="cx">     def homeResourceCreator(self, record, transaction):
</span><span class="cx">         return DirectoryCalendarHomeResource.createHomeResource(
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorycommonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/common.py (13119 => 13120)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/common.py        2014-04-02 18:22:36 UTC (rev 13119)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/common.py        2014-04-02 18:22:48 UTC (rev 13120)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> 
</span><span class="cx"> uidsResourceName = &quot;__uids__&quot;
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> class CommonUIDProvisioningResource(object):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Common ancestor for addressbook/calendar UID provisioning resources.
</span><span class="lines">@@ -71,11 +72,10 @@
</span><span class="cx">             log.debug(&quot;No directory record with UID %r&quot; % (name,))
</span><span class="cx">             returnValue(None)
</span><span class="cx"> 
</span><del>-        # MOVE2WHO
-        # if not getattr(record, self.enabledAttribute):
-        #     log.debug(&quot;Directory record %r is not enabled for %s&quot; % (
-        #         record, self.homeResourceTypeName))
-        #     returnValue(None)
</del><ins>+        if not getattr(record, self.enabledAttribute, False):
+            log.debug(&quot;Directory record %r is not enabled for %s&quot; % (
+                record, self.homeResourceTypeName))
+            returnValue(None)
</ins><span class="cx"> 
</span><span class="cx">         assert len(name) &gt; 4, &quot;Directory record has an invalid GUID: %r&quot; % (
</span><span class="cx">             name,)
</span></span></pre>
</div>
</div>

</body>
</html>