<!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>[13643] </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/13643">13643</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-06-17 03:08:02 -0700 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>use separate config options for addressbook and vcard group sharing. Add CalDAVTester "feature" for group sharing. Group sharing temporarily disabled for caldavtester testing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptsserverserverinfoxml">CalDAVTester/trunk/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingaccessxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingbulkxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharinggroupsxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingputxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingsyncxml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVsharingunsharexml">CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml (13642 => 13643)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-06-17 05:21:39 UTC (rev 13642)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml 2014-06-17 10:08:02 UTC (rev 13643)
</span><span class="lines">@@ -110,6 +110,7 @@
</span><span class="cx"> <feature>carddav</feature> <!-- Basic CardDAV feature enabler -->
</span><span class="cx"> <feature>default-addressbook</feature> <!-- Default address book behavior -->
</span><span class="cx"> <feature>shared-addressbooks</feature> <!-- Shared address books extension -->
</span><ins>+ <!-- <feature>shared-groups</feature> --> <!-- Shared groups extension -->
</ins><span class="cx"> <feature>directory-gateway</feature> <!-- Directory gateway extension -->
</span><span class="cx">
</span><span class="cx"> </features>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingaccessxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml (13642 => 13643)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml 2014-06-17 05:21:39 UTC (rev 13642)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml 2014-06-17 10:08:02 UTC (rev 13643)
</span><span class="lines">@@ -489,6 +489,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> <test-suite name='read-write shared group' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='0' ignore='no'>
</span><span class="cx"> <description>reset user1 home and share user2 group read-write</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="lines">@@ -721,6 +724,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> <test-suite name='read-only shared group' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='0' ignore='no'>
</span><span class="cx"> <description>reset user1 home and share user2 group 345 read-only</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="lines">@@ -899,6 +905,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='overlapping read-only, read-write shared group' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='0' ignore='no'>
</span><span class="cx"> <description>reset user1 home and share user2 group g123 read-write, group 345 read-only</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="lines">@@ -1227,6 +1236,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='overlapping read-only, read-write shared groups, read-write addressbook' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='0' ignore='no'>
</span><span class="cx"> <description>share user2 addressbook read-write</description>
</span><span class="cx"> <!-- user2 POSTs invitation -->
</span><span class="lines">@@ -1371,6 +1383,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='overlapping read-only, read-write shared groups, read-only addressbook' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='0' ignore='no'>
</span><span class="cx"> <description>share user2 addressbook read-only</description>
</span><span class="cx"> <!-- user2 POSTs invitation -->
</span><span class="lines">@@ -1477,6 +1492,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='add to ab with two read-write shared groups' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='0' ignore='no'>
</span><span class="cx"> <description>unshare address book, share 345 read-write</description>
</span><span class="cx"> <request>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingbulkxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml (13642 => 13643)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml 2014-06-17 05:21:39 UTC (rev 13642)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml 2014-06-17 10:08:02 UTC (rev 13643)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> <feature>carddav</feature>
</span><span class="cx"> <feature>bulk-post</feature>
</span><span class="cx"> <feature>shared-addressbooks</feature>
</span><ins>+ <feature>shared-groups</feature>
</ins><span class="cx"> </require-feature>
</span><span class="cx">
</span><span class="cx"> <start>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharinggroupsxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml (13642 => 13643)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml 2014-06-17 05:21:39 UTC (rev 13642)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml 2014-06-17 10:08:02 UTC (rev 13643)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> <require-feature>
</span><span class="cx"> <feature>carddav</feature>
</span><span class="cx"> <feature>shared-addressbooks</feature>
</span><ins>+ <feature>shared-groups</feature>
</ins><span class="cx"> </require-feature>
</span><span class="cx">
</span><span class="cx"> <start>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingputxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml (13642 => 13643)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml 2014-06-17 05:21:39 UTC (rev 13642)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml 2014-06-17 10:08:02 UTC (rev 13643)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> <require-feature>
</span><span class="cx"> <feature>carddav</feature>
</span><span class="cx"> <feature>shared-addressbooks</feature>
</span><ins>+ <feature>shared-groups</feature>
</ins><span class="cx"> </require-feature>
</span><span class="cx">
</span><span class="cx"> <start>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingsyncxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml (13642 => 13643)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2014-06-17 05:21:39 UTC (rev 13642)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml 2014-06-17 10:08:02 UTC (rev 13643)
</span><span class="lines">@@ -919,6 +919,9 @@
</span><span class="cx">
</span><span class="cx"> <!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
</span><span class="cx"> <test-suite name='one shared group'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='0'>
</span><span class="cx"> <description>clean up old data</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="lines">@@ -2234,6 +2237,9 @@
</span><span class="cx">
</span><span class="cx"> <!-- test suite below is similar to test suite in ../CalDAV/sharing-sync.xml -->
</span><span class="cx"> <test-suite name='two shared groups'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='0'>
</span><span class="cx"> <description>clean up old data</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVsharingunsharexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml (13642 => 13643)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml 2014-06-17 05:21:39 UTC (rev 13642)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml 2014-06-17 10:08:02 UTC (rev 13643)
</span><span class="lines">@@ -431,6 +431,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='reshare addressbook, sharee delete addressbook group' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='1' ignore='no'>
</span><span class="cx"> <description>POST invitation</description>
</span><span class="cx"> <request print-response='no'>
</span><span class="lines">@@ -1024,6 +1027,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='create and share group, sharee decline' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='0' ignore='no'>
</span><span class="cx"> <description>cleanup and initialize</description>
</span><span class="cx"> <request user="$useradmin:" pswd="$pswdadmin:">
</span><span class="lines">@@ -1264,6 +1270,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='reshare group, sharee delete addressbook' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='1' ignore='no'>
</span><span class="cx"> <description>POST invitation</description>
</span><span class="cx"> <request print-response='no'>
</span><span class="lines">@@ -1461,6 +1470,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='reshare group, sharee delete group' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='1' ignore='no'>
</span><span class="cx"> <description>POST invitation</description>
</span><span class="cx"> <request print-response='no'>
</span><span class="lines">@@ -1658,6 +1670,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='reshare group, sharer uninvite' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='1' ignore='no'>
</span><span class="cx"> <description>POST invitation</description>
</span><span class="cx"> <request print-response='no'>
</span><span class="lines">@@ -1855,6 +1870,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='reshare group, sharer delete group' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='1' ignore='no'>
</span><span class="cx"> <description>POST invitation</description>
</span><span class="cx"> <request print-response='no'>
</span><span class="lines">@@ -2053,6 +2071,9 @@
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><span class="cx"> <test-suite name='recreate and share group, sharer delete addressbook' ignore='no'>
</span><ins>+ <require-feature>
+ <feature>shared-groups</feature>
+ </require-feature>
</ins><span class="cx"> <test name='0' ignore='no'>
</span><span class="cx"> <request user="$userid1:" pswd="$pswd1:">
</span><span class="cx"> <method>PUT</method>
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (13642 => 13643)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2014-06-17 05:21:39 UTC (rev 13642)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2014-06-17 10:08:02 UTC (rev 13643)
</span><span class="lines">@@ -476,7 +476,10 @@
</span><span class="cx"> customxml.SharedURL.qname(),
</span><span class="cx"> )
</span><span class="cx">
</span><del>- elif config.Sharing.AddressBooks.Enabled and (self.isAddressBookCollection() or self.isGroup()) and not self.isDirectoryBackedAddressBookCollection():
</del><ins>+ elif (
+ config.Sharing.AddressBooks.Enabled and self.isAddressBookCollection() or
+ config.Sharing.AddressBooks.Groups.Enabled and self.isGroup()
+ ) and not self.isDirectoryBackedAddressBookCollection():
</ins><span class="cx"> baseProperties += (
</span><span class="cx"> customxml.Invite.qname(),
</span><span class="cx"> customxml.AllowedSharingModes.qname(),
</span><span class="lines">@@ -676,17 +679,23 @@
</span><span class="cx">
</span><span class="cx"> elif qname == customxml.Invite.qname():
</span><span class="cx"> if config.Sharing.Enabled and (
</span><del>- config.Sharing.Calendars.Enabled and self.isCalendarCollection() or
- config.Sharing.AddressBooks.Enabled and (self.isAddressBookCollection() or self.isGroup()) and not self.isDirectoryBackedAddressBookCollection()
</del><ins>+ config.Sharing.Calendars.Enabled and self.isCalendarCollection() or (
+ config.Sharing.AddressBooks.Enabled and self.isAddressBookCollection() or
+ config.Sharing.AddressBooks.Groups.Enabled and self.isGroup()
+ ) and not self.isDirectoryBackedAddressBookCollection()
</ins><span class="cx"> ):
</span><span class="cx"> result = (yield self.inviteProperty(request))
</span><span class="cx"> returnValue(result)
</span><span class="cx">
</span><span class="cx"> elif qname == customxml.AllowedSharingModes.qname():
</span><del>- if config.Sharing.Enabled and config.Sharing.Calendars.Enabled and self.isCalendarCollection():
- returnValue(customxml.AllowedSharingModes(customxml.CanBeShared()))
- elif config.Sharing.Enabled and config.Sharing.AddressBooks.Enabled and (self.isAddressBookCollection() or self.isGroup()) and not self.isDirectoryBackedAddressBookCollection():
- returnValue(customxml.AllowedSharingModes(customxml.CanBeShared()))
</del><ins>+ if config.Sharing.Enabled:
+ if config.Sharing.Calendars.Enabled and self.isCalendarCollection():
+ returnValue(customxml.AllowedSharingModes(customxml.CanBeShared()))
+ elif (
+ config.Sharing.AddressBooks.Enabled and self.isAddressBookCollection() or
+ config.Sharing.AddressBooks.Groups.Enabled and self.isGroup()
+ ) and not self.isDirectoryBackedAddressBookCollection():
+ returnValue(customxml.AllowedSharingModes(customxml.CanBeShared()))
</ins><span class="cx">
</span><span class="cx"> elif qname == customxml.SharedURL.qname():
</span><span class="cx"> if self.isShareeResource():
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (13642 => 13643)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-06-17 05:21:39 UTC (rev 13642)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-06-17 10:08:02 UTC (rev 13643)
</span><span class="lines">@@ -631,6 +631,9 @@
</span><span class="cx"> "Global": [
</span><span class="cx"> ],
</span><span class="cx"> },
</span><ins>+ "Groups" : {
+ "Enabled" : False, # Address Books on/off switch
+ },
</ins><span class="cx"> },
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (13642 => 13643)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2014-06-17 05:21:39 UTC (rev 13642)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2014-06-17 10:08:02 UTC (rev 13643)
</span><span class="lines">@@ -3570,7 +3570,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def canBeShared(self):
</span><del>- return config.Sharing.Enabled and config.Sharing.AddressBooks.Enabled
</del><ins>+ return (
+ config.Sharing.Enabled and
+ config.Sharing.AddressBooks.Enabled and
+ config.Sharing.AddressBooks.Groups.Enabled
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre>
</div>
</div>
</body>
</html>