<!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>[14104] 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/14104">14104</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-10-24 17:23:04 -0700 (Fri, 24 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix augment problem where groups' hasCalendars/hasContacts was not being set to False</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_principalpy">CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoaugmentpy">CalendarServer/trunk/txdav/who/augment.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_principalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py 2014-10-24 21:12:40 UTC (rev 14103)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py 2014-10-25 00:23:04 UTC (rev 14104)
</span><span class="lines">@@ -604,7 +604,9 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # Verify that if not enabled for calendaring, no CUAs:
</span><del>- record.hasCalendars = False
</del><ins>+ record.fields[
+ record.service.fieldName.lookupByName(u"hasCalendars")
+ ] = False
</ins><span class="cx"> self.failIf(recordResource.calendarUserAddresses())
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -638,9 +640,13 @@
</span><span class="cx">
</span><span class="cx"> # Turn off hasContacts and addressBookHomeURLs
</span><span class="cx"> # should be empty
</span><del>- record.hasContacts = False
</del><ins>+ record.fields[
+ record.service.fieldName.lookupByName(u"hasContacts")
+ ] = False
</ins><span class="cx"> self.failIf(tuple(recordResource.addressBookHomeURLs()))
</span><del>- record.hasContacts = True
</del><ins>+ record.fields[
+ record.service.fieldName.lookupByName(u"hasContacts")
+ ] = True
</ins><span class="cx">
</span><span class="cx"> addressBookRootResource = yield self.actualRoot.getChild("addressbooks")
</span><span class="cx"> addressBookRootURL = addressBookRootResource.url()
</span><span class="lines">@@ -697,9 +703,13 @@
</span><span class="cx">
</span><span class="cx"> # Turn off hasCalendars and calendarHomeURLs should
</span><span class="cx"> # be empty
</span><del>- record.hasCalendars = False
</del><ins>+ record.fields[
+ record.service.fieldName.lookupByName(u"hasCalendars")
+ ] = False
</ins><span class="cx"> self.failIf(tuple(recordResource.calendarHomeURLs()))
</span><del>- record.hasCalendars = True
</del><ins>+ record.fields[
+ record.service.fieldName.lookupByName(u"hasCalendars")
+ ] = True
</ins><span class="cx">
</span><span class="cx"> calendarRootResource = yield self.rootResource.getChild("calendars")
</span><span class="cx"> calendarRootURL = calendarRootResource.url()
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/augment.py (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/augment.py 2014-10-24 21:12:40 UTC (rev 14103)
+++ CalendarServer/trunk/txdav/who/augment.py 2014-10-25 00:23:04 UTC (rev 14104)
</span><span class="lines">@@ -390,19 +390,21 @@
</span><span class="cx">
</span><span class="cx"> fields = record.fields.copy()
</span><span class="cx">
</span><del>- # print("Got augment record", augmentRecord)
-
</del><span class="cx"> if augmentRecord:
</span><span class="cx">
</span><del>- self._assignToField(
- fields, "hasCalendars",
- augmentRecord.enabledForCalendaring
- )
</del><ins>+ if record.recordType == RecordType.group:
+ self._assignToField(fields, "hasCalendars", False)
+ self._assignToField(fields, "hasContacts", False)
+ else:
+ self._assignToField(
+ fields, "hasCalendars",
+ augmentRecord.enabledForCalendaring
+ )
</ins><span class="cx">
</span><del>- self._assignToField(
- fields, "hasContacts",
- augmentRecord.enabledForAddressBooks
- )
</del><ins>+ self._assignToField(
+ fields, "hasContacts",
+ augmentRecord.enabledForAddressBooks
+ )
</ins><span class="cx">
</span><span class="cx"> autoScheduleMode = {
</span><span class="cx"> "none": AutoScheduleMode.none,
</span><span class="lines">@@ -442,29 +444,7 @@
</span><span class="cx"> augmentRecord.serverID.decode("utf-8")
</span><span class="cx"> )
</span><span class="cx">
</span><del>- if (
- (
- fields.get(
- self.fieldName.lookupByName("hasCalendars"), False
- ) or
- fields.get(
- self.fieldName.lookupByName("hasContacts"), False
- )
- ) and
- record.recordType == RecordType.group
- ):
- self._assignToField(fields, "hasCalendars", False)
- self._assignToField(fields, "hasContacts", False)
</del><span class="cx">
</span><del>- # For augment records cloned from the Default augment record,
- # don't emit this message:
- if not augmentRecord.clonedFromDefault:
- log.error(
- "Group {record} cannot be enabled for "
- "calendaring or address books",
- record=record
- )
-
</del><span class="cx"> else:
</span><span class="cx"> self._assignToField(fields, "hasCalendars", False)
</span><span class="cx"> self._assignToField(fields, "hasContacts", False)
</span></span></pre>
</div>
</div>
</body>
</html>