<!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>[13005] CalendarServer/branches/users/sagen/move2who-4</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/13005">13005</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-26 18:41:11 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix auto-accept-group, adds expandedMembers( )</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4confauthaccountstestxml">CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaccountsxml">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaugmentsxml">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytesttest_principalpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_principal.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhoaugmentpy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhoutilpy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/util.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhotesttest_directorypy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4confauthaccountstestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml (13004 => 13005)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml 2014-03-26 20:27:19 UTC (rev 13004)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml 2014-03-27 01:41:11 UTC (rev 13005)
</span><span class="lines">@@ -372,8 +372,8 @@
</span><span class="cx"> <short-name>group02</short-name>
</span><span class="cx"> <password>group02</password>
</span><span class="cx"> <full-name>Group 02</full-name>
</span><del>- <member-uid type="users">user06</member-uid>
- <member-uid type="users">user07</member-uid>
</del><ins>+ <member-uid >user06</member-uid>
+ <member-uid >user07</member-uid>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><span class="cx"> <uid>group03</uid>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaccountsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml (13004 => 13005)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml 2014-03-26 20:27:19 UTC (rev 13004)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/accounts.xml 2014-03-27 01:41:11 UTC (rev 13005)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> <short-name>delegategroup</short-name>
</span><span class="cx"> <uid>00599DAF-3E75-42DD-9DB7-52617E79943F</uid>
</span><span class="cx"> <full-name>Delegate Group</full-name>
</span><del>- <member-uid>delegateviagroup</member-uid>
</del><ins>+ <member-uid>46D9D716-CBEE-490F-907A-66FA6C3767FF</member-uid>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="lines">@@ -204,39 +204,39 @@
</span><span class="cx"> <uid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</uid>
</span><span class="cx"> <password>managers</password>
</span><span class="cx"> <full-name>Managers</full-name>
</span><del>- <member-uid>lecroy</member-uid>
</del><ins>+ <member-uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</member-uid>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><span class="cx"> <short-name>admin</short-name>
</span><span class="cx"> <uid>admin</uid>
</span><span class="cx"> <password>admin</password>
</span><span class="cx"> <full-name>Administrators</full-name>
</span><del>- <member-uid>managers</member-uid>
</del><ins>+ <member-uid>9FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</member-uid>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><span class="cx"> <short-name>grunts</short-name>
</span><span class="cx"> <uid>grunts</uid>
</span><span class="cx"> <password>grunts</password>
</span><span class="cx"> <full-name>We do all the work</full-name>
</span><del>- <member-uid>wsanchez</member-uid>
- <member-uid>cdaboo</member-uid>
- <member-uid>dreid</member-uid>
</del><ins>+ <member-uid>6423F94A-6B76-4A3A-815B-D52CFD77935D</member-uid>
+ <member-uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</member-uid>
+ <member-uid>5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</member-uid>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><span class="cx"> <short-name>right_coast</short-name>
</span><span class="cx"> <uid>right_coast</uid>
</span><span class="cx"> <password>right_coast</password>
</span><span class="cx"> <full-name>East Coast</full-name>
</span><del>- <member-uid>cdaboo</member-uid>
</del><ins>+ <member-uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</member-uid>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><span class="cx"> <short-name>left_coast</short-name>
</span><span class="cx"> <uid>left_coast</uid>
</span><span class="cx"> <password>left_coast</password>
</span><span class="cx"> <full-name>West Coast</full-name>
</span><del>- <member-uid>wsanchez</member-uid>
- <member-uid>lecroy</member-uid>
- <member-uid>dreid</member-uid>
</del><ins>+ <member-uid>6423F94A-6B76-4A3A-815B-D52CFD77935D</member-uid>
+ <member-uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</member-uid>
+ <member-uid>5FF60DAD-0BDE-4508-8C77-15F0CA5C8DD1</member-uid>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><span class="cx"> <short-name>both_coasts</short-name>
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> <password>recursive1_coasts</password>
</span><span class="cx"> <full-name>Recursive1 Coasts</full-name>
</span><span class="cx"> <member-uid>recursive2_coasts</member-uid>
</span><del>- <member-uid>wsanchez</member-uid>
</del><ins>+ <member-uid>6423F94A-6B76-4A3A-815B-D52CFD77935D</member-uid>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><span class="cx"> <short-name>recursive2_coasts</short-name>
</span><span class="lines">@@ -260,15 +260,15 @@
</span><span class="cx"> <password>recursive2_coasts</password>
</span><span class="cx"> <full-name>Recursive2 Coasts</full-name>
</span><span class="cx"> <member-uid>recursive1_coasts</member-uid>
</span><del>- <member-uid>cdaboo</member-uid>
</del><ins>+ <member-uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</member-uid>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="group">
</span><span class="cx"> <short-name>non_calendar_group</short-name>
</span><span class="cx"> <uid>non_calendar_group</uid>
</span><span class="cx"> <password>non_calendar_group</password>
</span><span class="cx"> <full-name>Non-calendar group</full-name>
</span><del>- <member-uid>cdaboo</member-uid>
- <member-uid>lecroy</member-uid>
</del><ins>+ <member-uid>5A985493-EE2C-4665-94CF-4DFEA3A89500</member-uid>
+ <member-uid>8B4288F6-CC82-491D-8EF9-642EF4F3E7D0</member-uid>
</ins><span class="cx"> </record>
</span><span class="cx"> <!--
</span><span class="cx"> <location>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestaugmentsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml (13004 => 13005)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml 2014-03-26 20:27:19 UTC (rev 13004)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/augments.xml 2014-03-27 01:41:11 UTC (rev 13005)
</span><span class="lines">@@ -19,7 +19,24 @@
</span><span class="cx"> <!DOCTYPE augments SYSTEM "../../../conf/auth/augments.dtd">
</span><span class="cx">
</span><span class="cx"> <augments realm="Test">
</span><ins>+ <!--
</ins><span class="cx"> <record>
</span><ins>+ <uid>Location-Default</uid>
+ <enable>true</enable>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+ <auto-schedule-mode>automatic</auto-schedule-mode>
+ </record>
+ <record>
+ <uid>Resource-Default</uid>
+ <enable>true</enable>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+ <auto-schedule-mode>automatic</auto-schedule-mode>
+ </record>
+ -->
+
+ <record>
</ins><span class="cx"> <uid>D11F03A0-97EA-48AF-9A6C-FAC7F3975766</uid>
</span><span class="cx"> <enable>true</enable>
</span><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="lines">@@ -140,12 +157,14 @@
</span><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><ins>+ <!--
</ins><span class="cx"> <record>
</span><span class="cx"> <uid>non_calendar_proxy</uid>
</span><span class="cx"> <enable>true</enable>
</span><span class="cx"> <enable-calendar>true</enable-calendar>
</span><span class="cx"> <enable-addressbook>true</enable-addressbook>
</span><span class="cx"> </record>
</span><ins>+-->
</ins><span class="cx"> <record>
</span><span class="cx"> <uid>disabled</uid>
</span><span class="cx"> <enable>false</enable>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytesttest_principalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_principal.py (13004 => 13005)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_principal.py 2014-03-26 20:27:19 UTC (rev 13004)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/test_principal.py 2014-03-27 01:41:11 UTC (rev 13005)
</span><span class="lines">@@ -541,13 +541,12 @@
</span><span class="cx"> for (
</span><span class="cx"> provisioningResource, recordType, recordResource, record
</span><span class="cx"> ) in (yield self._allRecords()):
</span><del>- if True: # user.enabled:
- members = yield recordResource.groupMembers()
- self.failUnless(
- set((yield record.members())).issubset(
- set(r.record for r in members)
- )
</del><ins>+ members = yield recordResource.groupMembers()
+ self.failUnless(
+ set((yield record.members())).issubset(
+ set(r.record for r in members)
</ins><span class="cx"> )
</span><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -770,9 +769,13 @@
</span><span class="cx"> if record.hasCalendars:
</span><span class="cx"> if (
</span><span class="cx"> recordType in (CalRecordType.location, CalRecordType.resource) or
</span><del>- record.uid == "5A985493-EE2C-4665-94CF-4DFEA3A89500"
</del><ins>+ record.uid == u"5A985493-EE2C-4665-94CF-4DFEA3A89500"
</ins><span class="cx"> ):
</span><del>- record.fields[record.service.fieldName.lookupByName("autoScheduleMode")] = AutoScheduleMode.acceptIfFreeDeclineIfBusy
</del><ins>+ record.fields[
+ record.service.fieldName.lookupByName(
+ "autoScheduleMode"
+ )
+ ] = AutoScheduleMode.acceptIfFreeDeclineIfBusy
</ins><span class="cx">
</span><span class="cx"> self.assertTrue((yield recordResource.canAutoSchedule()))
</span><span class="cx"> else:
</span><span class="lines">@@ -797,30 +800,34 @@
</span><span class="cx"> # augments.xml, therefore any organizer in that group should be able to
</span><span class="cx"> # auto schedule
</span><span class="cx">
</span><del>- for (
- provisioningResource, recordType, recordResource, record
- ) in (yield self._allRecords()):
- if record.uid == "apollo":
</del><ins>+ record = yield self.directory.recordWithUID(u"apollo")
</ins><span class="cx">
</span><del>- # No organizer
- self.assertFalse((yield recordResource.canAutoSchedule()))
</del><ins>+ # Turn off this record's autoschedule
+ record.fields[
+ record.service.fieldName.lookupByName(
+ "autoScheduleMode"
+ )
+ ] = AutoScheduleMode.none
</ins><span class="cx">
</span><del>- # Organizer in auto-accept group
- self.assertTrue(
- (
- yield recordResource.canAutoSchedule(
- organizer="mailto:wsanchez@example.com"
- )
- )
</del><ins>+ # No organizer
+ self.assertFalse((yield record.canAutoSchedule()))
+
+ # Organizer in auto-accept group
+ self.assertTrue(
+ (
+ yield record.canAutoSchedule(
+ organizer="mailto:wsanchez@example.com"
</ins><span class="cx"> )
</span><del>- # Organizer not in auto-accept group
- self.assertFalse(
- (
- yield recordResource.canAutoSchedule(
- organizer="mailto:a@example.com"
- )
- )
</del><ins>+ )
+ )
+ # Organizer not in auto-accept group
+ self.assertFalse(
+ (
+ yield record.canAutoSchedule(
+ organizer="mailto:a@example.com"
</ins><span class="cx"> )
</span><ins>+ )
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py (13004 => 13005)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-03-26 20:27:19 UTC (rev 13004)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py 2014-03-27 01:41:11 UTC (rev 13005)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> ## Separate store for DPS (augments and delegates separate from calendar data)
</span><span class="cx"> ## calverify needs deferreds, including:
</span><span class="cx"> ## component.normalizeCalendarUserAddresses
</span><ins>+## Store autoAcceptGroups in the group db?
</ins><span class="cx">
</span><span class="cx"> @implementer(IDirectoryService, IStoreDirectoryService)
</span><span class="cx"> class DirectoryService(BaseDirectoryService, CalendarDirectoryServiceMixin):
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhoaugmentpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py (13004 => 13005)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py 2014-03-26 20:27:19 UTC (rev 13004)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py 2014-03-27 01:41:11 UTC (rev 13005)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> CalendarDirectoryRecordMixin, CalendarDirectoryServiceMixin,
</span><span class="cx"> )
</span><span class="cx"> from txdav.who.idirectory import (
</span><del>- AutoScheduleMode, FieldName
</del><ins>+ AutoScheduleMode, FieldName, RecordType as CalRecordType
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="lines">@@ -304,6 +304,14 @@
</span><span class="cx"> "automatic": AutoScheduleMode.acceptIfFreeDeclineIfBusy,
</span><span class="cx"> }.get(augmentRecord.autoScheduleMode, None)
</span><span class="cx">
</span><ins>+ # Resources/Locations default to automatic
+ if record.recordType in (
+ CalRecordType.location,
+ CalRecordType.resource
+ ):
+ if autoScheduleMode is None:
+ autoScheduleMode = AutoScheduleMode.acceptIfFreeDeclineIfBusy
+
</ins><span class="cx"> self._assignToField(
</span><span class="cx"> fields, "autoScheduleMode",
</span><span class="cx"> autoScheduleMode
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py (13004 => 13005)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py 2014-03-26 20:27:19 UTC (rev 13004)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py 2014-03-27 01:41:11 UTC (rev 13005)
</span><span class="lines">@@ -420,6 +420,23 @@
</span><span class="cx"> organizerRecord = yield service.recordWithCalendarUserAddress(organizer)
</span><span class="cx"> if organizerRecord is not None:
</span><span class="cx"> autoAcceptGroup = yield service.recordWithUID(autoAcceptGroup)
</span><del>- if organizerRecord.uid in (yield autoAcceptGroup.members()):
</del><ins>+ members = yield autoAcceptGroup.expandedMembers()
+ if organizerRecord.uid in ([m.uid for m in members]):
</ins><span class="cx"> returnValue(True)
</span><span class="cx"> returnValue(False)
</span><ins>+
+
+ @inlineCallbacks
+ def expandedMembers(self, members=None):
+
+ if members is None:
+ members = set()
+
+ for member in (yield self.members()):
+ if member.recordType == BaseRecordType.user:
+ if member not in members:
+ members.add(member)
+ elif member.recordType == BaseRecordType.group:
+ yield member.expandedMembers(members)
+
+ returnValue(members)
</ins></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhotesttest_directorypy"></a>
<div class="addfile"><h4>Added: CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_directory.py (0 => 13005)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_directory.py (rev 0)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/test/test_directory.py 2014-03-27 01:41:11 UTC (rev 13005)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+##
+# Copyright (c) 2013 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+Directory tests
+"""
+
+from twisted.internet.defer import inlineCallbacks
+from twistedcaldav.test.util import StoreTestCase
+
+
+class DirectoryTestCase(StoreTestCase):
+
+ @inlineCallbacks
+ def test_expandedMembers(self):
+
+ record = yield self.directory.recordWithUID(u"both_coasts")
+
+ direct = yield record.members()
+ self.assertEquals(
+ set([u"left_coast", u"right_coast"]),
+ set([r.uid for r in direct])
+ )
+
+ expanded = yield record.expandedMembers()
+ self.assertEquals(
+ set([u"Chris Lecroy", u"Cyrus Daboo", u"David Reid", u"Wilfredo Sanchez"]),
+ set([r.displayName for r in expanded])
+ )
</ins></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhoutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/util.py (13004 => 13005)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/util.py 2014-03-26 20:27:19 UTC (rev 13004)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/util.py 2014-03-27 01:41:11 UTC (rev 13005)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx">
</span><span class="cx"> # Set the appropriate record types on each service
</span><span class="cx"> types = []
</span><ins>+ fieldNames = []
</ins><span class="cx"> for recordTypeName in params.recordTypes:
</span><span class="cx"> recordType = {
</span><span class="cx"> "users": RecordType.user,
</span><span class="lines">@@ -127,7 +128,10 @@
</span><span class="cx"> types.append(recordType)
</span><span class="cx">
</span><span class="cx"> directory.recordType = ConstantsContainer(types)
</span><del>- directory.fieldName = ConstantsContainer((FieldName, CalFieldName))
</del><ins>+ directory.fieldName = ConstantsContainer(
+ (directory.fieldName, CalFieldName)
+ )
+ fieldNames.append(directory.fieldName)
</ins><span class="cx"> aggregatedServices.append(directory)
</span><span class="cx">
</span><span class="cx"> #
</span><span class="lines">@@ -166,9 +170,11 @@
</span><span class="cx"> userDirectory.realmName, aggregatedServices
</span><span class="cx"> )
</span><span class="cx"> try:
</span><ins>+ fieldNames.append(CalFieldName)
</ins><span class="cx"> augmented = AugmentedDirectoryService(
</span><span class="cx"> aggregateDirectory, store, augmentService
</span><span class="cx"> )
</span><ins>+ augmented.fieldName = ConstantsContainer(fieldNames)
</ins><span class="cx">
</span><span class="cx"> # The delegate directory needs a way to look up user/group records
</span><span class="cx"> # so hand it a reference to the augmented directory.
</span></span></pre>
</div>
</div>
</body>
</html>