<!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>[14809] 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/14809">14809</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-20 01:39:48 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure task-only calendars are ignored during freebusy checks.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsstabletxt">CalendarServer/trunk/requirements-stable.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavscheduling_storecaldavtesttest_resourcepy">CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt (14808 => 14809)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-stable.txt 2015-05-20 08:37:18 UTC (rev 14808)
+++ CalendarServer/trunk/requirements-stable.txt 2015-05-20 08:39:48 UTC (rev 14809)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #pyOpenSSL
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14786#egg=twextpy
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14808#egg=twextpy
</ins><span class="cx"> cffi==0.8.6
</span><span class="cx"> pycparser==2.10
</span><span class="cx"> #twisted
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavscheduling_storecaldavtesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py (14808 => 14809)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py 2015-05-20 08:37:18 UTC (rev 14808)
+++ CalendarServer/trunk/twistedcaldav/scheduling_store/caldav/test/test_resource.py 2015-05-20 08:39:48 UTC (rev 14809)
</span><span class="lines">@@ -103,6 +103,40 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_free_busy_set_tasks(self):
+ """
+ Test that calendar-free-busy-set ignores tasks calendar.
+ """
+
+ request = SimpleRequest(self.site, "GET", "/calendars/users/user01/inbox/")
+ inbox = yield request.locateResource("/calendars/users/user01/inbox/")
+ self.assertTrue((yield inbox.hasProperty(caldavxml.CalendarFreeBusySet, request)))
+ prop = (yield inbox.readProperty(caldavxml.CalendarFreeBusySet, request))
+ self.assertEqual(
+ set([str(child) for child in prop.children]),
+ set((
+ "/calendars/__uids__/user01/calendar/",
+ ))
+ )
+ newfbset = set()
+ newfbset.add("/calendars/users/user01/tasks/")
+ newset = caldavxml.CalendarFreeBusySet(*[davxml.HRef(url) for url in newfbset])
+
+ yield inbox.writeProperty(newset, request)
+ yield request._newStoreTransaction.commit()
+
+ request = SimpleRequest(self.site, "GET", "/calendars/users/user01/inbox/")
+ inbox = yield request.locateResource("/calendars/users/user01/inbox/")
+ prop = (yield inbox.readProperty(caldavxml.CalendarFreeBusySet, request))
+ self.assertEqual(len(prop.children), 0)
+ yield request._newStoreTransaction.commit()
+ calendar = yield request.locateResource("/calendars/__uids__/user01/tasks/")
+ self.assertFalse(calendar._newStoreObject.isUsedForFreeBusy())
+ calendar = yield request.locateResource("/calendars/__uids__/user01/calendar/")
+ self.assertFalse(calendar._newStoreObject.isUsedForFreeBusy())
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_free_busy_set_invalid_url(self):
</span><span class="cx"> """
</span><span class="cx"> Test that calendar-free-busy-set will generate an error if an invalid value is used.
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14808 => 14809)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-05-20 08:37:18 UTC (rev 14808)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-05-20 08:39:48 UTC (rev 14809)
</span><span class="lines">@@ -1590,12 +1590,13 @@
</span><span class="cx"> def isUsedForFreeBusy(self):
</span><span class="cx"> """
</span><span class="cx"> Indicates whether the contents of this calendar contributes to free busy. Always coerce
</span><del>- inbox to be transparent.
</del><ins>+ inbox to be transparent. Also ignore VTODO only calendars.
</ins><span class="cx">
</span><span class="cx"> @return: C{True} if it does, C{False} otherwise
</span><span class="cx"> @rtype: C{bool}
</span><span class="cx"> """
</span><del>- return (self._transp == _TRANSP_OPAQUE) and not self.isInbox() and not self.isTrash()
</del><ins>+ supported = not self._supportedComponents or self._supportedComponents.split(",") != ["VTODO", ]
+ return (self._transp == _TRANSP_OPAQUE) and not self.isInbox() and not self.isTrash() and supported
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (14808 => 14809)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2015-05-20 08:37:18 UTC (rev 14808)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2015-05-20 08:39:48 UTC (rev 14809)
</span><span class="lines">@@ -2053,6 +2053,36 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_tasksTransp(self):
+ """
+ Make sure tasks is always transparent no matter what is stored in the DB.
+ """
+
+ home = yield self.homeUnderTest(name="user01", create=True)
+ self.assertNotEqual(home, None)
+ tasks = yield self.calendarUnderTest(home="user01", name="tasks")
+ self.assertFalse(tasks.isUsedForFreeBusy())
+ yield tasks.setUsedForFreeBusy(True)
+ self.assertFalse(tasks.isUsedForFreeBusy())
+ yield self.commit()
+
+ tasks = yield self.calendarUnderTest(home="user01", name="tasks")
+ self.assertFalse(tasks.isUsedForFreeBusy())
+
+ cb = schema.CALENDAR_BIND
+ yield Update(
+ {cb.TRANSP: _TRANSP_OPAQUE},
+ Where=(cb.CALENDAR_RESOURCE_NAME == "tasks").And(
+ cb.CALENDAR_RESOURCE_ID == tasks.id()
+ )
+ ).on(self.transactionUnderTest())
+ yield self.commit()
+
+ tasks = yield self.calendarUnderTest(home="user01", name="tasks")
+ self.assertFalse(tasks.isUsedForFreeBusy())
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_missingTimezone(self):
</span><span class="cx"> """
</span><span class="cx"> Make sure missing timezone causes an exception, whether or timezones by reference is on.
</span></span></pre>
</div>
</div>
</body>
</html>