<!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>[14682] 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/14682">14682</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-15 20:59:52 -0700 (Wed, 15 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix upgrading of older augments.xml</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkconfauthaugmentstestxml">CalendarServer/trunk/conf/auth/augments-test.xml</a></li>
<li><a href="#CalendarServertrunkconfauthgenerate_test_accountspy">CalendarServer/trunk/conf/auth/generate_test_accounts.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_upgradepy">CalendarServer/trunk/twistedcaldav/test/test_upgrade.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavupgradepy">CalendarServer/trunk/twistedcaldav/upgrade.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="CalendarServertrunkconfauthaugmentstestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/augments-test.xml (14681 => 14682)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/augments-test.xml 2015-04-15 18:23:12 UTC (rev 14681)
+++ CalendarServer/trunk/conf/auth/augments-test.xml 2015-04-16 03:59:52 UTC (rev 14682)
</span><span class="lines">@@ -25,13 +25,13 @@
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><del>- <uid>Default-Location</uid>
</del><ins>+ <uid>Location-Default</uid>
</ins><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule-mode>automatic</auto-schedule-mode>
</span><span class="cx"> </record>
</span><span class="cx"> <record>
</span><del>- <uid>Default-Resource</uid>
</del><ins>+ <uid>Resource-Default</uid>
</ins><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule-mode>automatic</auto-schedule-mode>
</span></span></pre></div>
<a id="CalendarServertrunkconfauthgenerate_test_accountspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/auth/generate_test_accounts.py (14681 => 14682)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/auth/generate_test_accounts.py 2015-04-15 18:23:12 UTC (rev 14681)
+++ CalendarServer/trunk/conf/auth/generate_test_accounts.py 2015-04-16 03:59:52 UTC (rev 14682)
</span><span class="lines">@@ -960,7 +960,7 @@
</span><span class="cx"> """)
</span><span class="cx">
</span><span class="cx"> out.write("""<record>
</span><del>- <uid>Default-Location</uid>
</del><ins>+ <uid>Location-Default</uid>
</ins><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule-mode>automatic</auto-schedule-mode>
</span><span class="lines">@@ -968,7 +968,7 @@
</span><span class="cx"> """)
</span><span class="cx">
</span><span class="cx"> out.write("""<record>
</span><del>- <uid>Default-Resource</uid>
</del><ins>+ <uid>Resource-Default</uid>
</ins><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <auto-schedule-mode>automatic</auto-schedule-mode>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_upgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py (14681 => 14682)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2015-04-15 18:23:12 UTC (rev 14681)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2015-04-16 03:59:52 UTC (rev 14682)
</span><span class="lines">@@ -1595,6 +1595,13 @@
</span><span class="cx"> <auto-schedule>true</auto-schedule>
</span><span class="cx"> <auto-schedule-mode>accept-if-free</auto-schedule-mode>
</span><span class="cx"> </record>
</span><ins>+ <record>
+ <uid>B35DDFCF-C5E2-475E-A57E-8AB7422E9BB8</uid>
+ <enable>true</enable>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+ <auto-schedule>false</auto-schedule>
+ </record>
</ins><span class="cx"> </augments>
</span><span class="cx"> """
</span><span class="cx">
</span><span class="lines">@@ -1614,6 +1621,7 @@
</span><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> <enable-login>true</enable-login>
</span><ins>+ <auto-schedule-mode>automatic</auto-schedule-mode>
</ins><span class="cx"> </record>
</span><span class="cx"> <record>
</span><span class="cx"> <uid>60B771CC-D727-4453-ACE0-0FE13CD7445A</uid>
</span><span class="lines">@@ -1636,6 +1644,12 @@
</span><span class="cx"> <enable-login>true</enable-login>
</span><span class="cx"> <auto-schedule-mode>accept-if-free</auto-schedule-mode>
</span><span class="cx"> </record>
</span><ins>+ <record>
+ <uid>B35DDFCF-C5E2-475E-A57E-8AB7422E9BB8</uid>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+ <auto-schedule-mode>none</auto-schedule-mode>
+ </record>
</ins><span class="cx"> </augments>
</span><span class="cx"> """
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/upgrade.py (14681 => 14682)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/upgrade.py 2015-04-15 18:23:12 UTC (rev 14681)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py 2015-04-16 03:59:52 UTC (rev 14682)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> from twistedcaldav.directory.resourceinfo import ResourceInfoDatabase
</span><span class="cx"> from twistedcaldav.directory.xmlaugmentsparser import ELEMENT_AUGMENTS
</span><span class="cx"> from twistedcaldav.ical import Component
</span><del>-from twistedcaldav.xmlutil import readXML, writeXML
</del><ins>+from twistedcaldav.xmlutil import readXML, writeXML, addSubElement
</ins><span class="cx">
</span><span class="cx"> from txdav.caldav.datastore.index_file import db_basename
</span><span class="cx"> from txdav.caldav.datastore.scheduling.cuaddress import LocalCalendarUser
</span><span class="lines">@@ -729,10 +729,17 @@
</span><span class="cx">
</span><span class="cx"> autoScheduleElement = recordNode.find("auto-schedule")
</span><span class="cx"> if autoScheduleElement is not None:
</span><ins>+ # This is a legacy augment record; if auto-schedule was true we
+ # need to set mode to "automatic", if false then set mode to "none".
+ # If auto-schedule was true and auto-schedule-mode existed, keep mode.
+
+ autoScheduleModeElement = recordNode.find("auto-schedule-mode")
+ if autoScheduleModeElement is None:
+ autoScheduleModeElement = addSubElement(recordNode, "auto-schedule-mode", text="automatic")
+
</ins><span class="cx"> if autoScheduleElement.text == "false":
</span><del>- autoScheduleModeElement = recordNode.find("auto-schedule-mode")
- if autoScheduleModeElement is not None:
- autoScheduleModeElement.text = "none"
</del><ins>+ autoScheduleModeElement.text = "none"
+
</ins><span class="cx"> recordNode.remove(autoScheduleElement)
</span><span class="cx"> changed = True
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/augment.py (14681 => 14682)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/augment.py 2015-04-15 18:23:12 UTC (rev 14681)
+++ CalendarServer/trunk/txdav/who/augment.py 2015-04-16 03:59:52 UTC (rev 14682)
</span><span class="lines">@@ -407,6 +407,15 @@
</span><span class="cx"> augmentRecord.enabledForAddressBooks
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ # In the case of XML augments, a missing auto-schedule-mode
+ # element has the same meaning an element with a value of "default"
+ # in which case augmentRecord.autoScheduleMode = "default". On
+ # the record we're augmenting, "default" mode means autoScheduleMode
+ # gets set to None (distinct from AutoScheduleMode.none!),
+ # which gets swapped for config.Scheduling.Options.AutoSchedule.DefaultMode
+ # in checkAttendeeAutoReply().
+ # ...Except for locations/resources which will default to automatic
+
</ins><span class="cx"> autoScheduleMode = {
</span><span class="cx"> "none": AutoScheduleMode.none,
</span><span class="cx"> "accept-always": AutoScheduleMode.accept,
</span></span></pre>
</div>
</div>
</body>
</html>