<!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>[13766] CalendarServer/branches/users/gaya/groupsharee2/txdav</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/13766">13766</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-07-16 16:30:52 -0700 (Wed, 16 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix _BIND_MODE_DIRECT _BIND_MODE_GROUP interactions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoresqlpy">CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoretesttest_sql_sharingpy">CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcommondatastoresqlpy">CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavwhogroupspy">CalendarServer/branches/users/gaya/groupsharee2/txdav/who/groups.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py (13765 => 13766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-16 20:30:19 UTC (rev 13765)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-16 23:30:52 UTC (rev 13766)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> from txdav.common.datastore.sql_tables import _ATTACHMENTS_MODE_NONE, \
</span><span class="cx"> _ATTACHMENTS_MODE_READ, _ATTACHMENTS_MODE_WRITE, _BIND_MODE_DIRECT, \
</span><span class="cx"> _BIND_MODE_GROUP, _BIND_MODE_GROUP_READ, _BIND_MODE_GROUP_WRITE, \
</span><del>- _BIND_MODE_OWN, _BIND_MODE_READ, _BIND_MODE_WRITE, _TRANSP_OPAQUE, \
- _TRANSP_TRANSPARENT, schema
</del><ins>+ _BIND_MODE_OWN, _BIND_MODE_READ, _BIND_MODE_WRITE, _BIND_STATUS_ACCEPTED, \
+ _TRANSP_OPAQUE, _TRANSP_TRANSPARENT, schema
</ins><span class="cx"> from txdav.common.icommondatastore import IndexedSearchException, \
</span><span class="cx"> InternalDataStoreError, HomeChildNameAlreadyExistsError, \
</span><span class="cx"> HomeChildNameNotAllowedError, ObjectResourceTooBigError, \
</span><span class="lines">@@ -1760,31 +1760,33 @@
</span><span class="cx"> reconcile bind table with group members
</span><span class="cx"> """
</span><span class="cx"> changed = False
</span><del>- if (yield self.updateShareeGroupLink, groupUID):
- record = (
- yield self._txn.directoryService().recordWithUID(groupUID.decode("utf-8"))
- )
- groupID = (yield self._txn.groupByUID(record.uid))[0]
</del><ins>+ if (yield self.updateShareeGroupLink(groupUID)):
+ groupID = (yield self._txn.groupByUID(groupUID))[0]
</ins><span class="cx"> memberUIDs = yield self._txn.groupMemberUIDs(groupID)
</span><span class="cx"> boundUIDs = set()
</span><span class="cx">
</span><del>- bind = schema.CALENDAR_BIND
</del><ins>+ home = self._homeSchema
+ bind = self._bindSchema
</ins><span class="cx"> rows = yield Select(
</span><del>- [bind.HOME_RESOURCE_ID],
- From=bind,
- Where=bind.CALENDAR_RESOURCE_ID == self._resourceID.And(
- (bind.BIND_MODE == _BIND_MODE_GROUP).Or(
- bind.BIND_MODE == _BIND_MODE_GROUP_READ).Or(
- bind.BIND_MODE == _BIND_MODE_GROUP_WRITE)
</del><ins>+ [home.OWNER_UID],
+ From=home,
+ Where=home.RESOURCE_ID.In(
+ Select(
+ [bind.HOME_RESOURCE_ID],
+ From=bind,
+ Where=(bind.CALENDAR_RESOURCE_ID == self._resourceID).And(
+ (bind.BIND_MODE == _BIND_MODE_GROUP).Or(
+ bind.BIND_MODE == _BIND_MODE_GROUP_READ).Or(
+ bind.BIND_MODE == _BIND_MODE_GROUP_WRITE)
+ )
+ )
</ins><span class="cx"> )
</span><span class="cx"> ).on(self._txn)
</span><del>- groupShareeHomeIDs = [row[0] for row in rows]
- for groupShareeHomeID in groupShareeHomeIDs:
- shareeHome = yield self._txn.calendarHomeWithResourceID(groupShareeHomeID, create=True)
- if shareeHome.uid() in memberUIDs:
- boundUIDs.add(shareeHome.uid())
</del><ins>+ for [shareeHomeUID] in rows:
+ if shareeHomeUID in memberUIDs:
+ boundUIDs.add(shareeHomeUID)
</ins><span class="cx"> else:
</span><del>- yield self.uninviteUIDFromShare(shareeHome.uid())
</del><ins>+ yield self.uninviteUIDFromShare(shareeHomeUID)
</ins><span class="cx"> changed = True
</span><span class="cx">
</span><span class="cx"> for memberUID in memberUIDs - boundUIDs:
</span><span class="lines">@@ -1812,16 +1814,39 @@
</span><span class="cx"> }.get(self._bindMode)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def _groupModeAfterRemovingOneIndividualSharee(self):
</span><span class="cx"> """
</span><span class="cx"> return group mode after adding one group sharee or None
</span><span class="cx"> """
</span><del>- return {
- _BIND_MODE_GROUP_READ: _BIND_MODE_GROUP,
- _BIND_MODE_GROUP_WRITE: _BIND_MODE_GROUP,
- }.get(self._bindMode)
</del><ins>+ if self._bindMode == _BIND_MODE_DIRECT:
+ gs = schema.GROUP_SHAREE
+ gm = schema.GROUP_MEMBERSHIP
+ rows = yield Select(
+ [Count(gs.GROUP_ID)],
+ From=gs,
+ Where=(
+ gs.GROUP_ID.In(
+ Select(
+ [gm.GROUP_ID],
+ From=gm,
+ Where=(
+ gm.MEMBER_UID == Parameter("uid")
+ )
+ )
+ )
+ )
+ ).on(self._txn, uid=self.viewerHome().uid())
+ groupMode = _BIND_MODE_GROUP if rows[0][0] > 0 else None
+ else:
+ groupMode = {
+ _BIND_MODE_GROUP_READ: _BIND_MODE_GROUP,
+ _BIND_MODE_GROUP_WRITE: _BIND_MODE_GROUP,
+ }.get(self._bindMode)
</ins><span class="cx">
</span><ins>+ returnValue(groupMode)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def _groupModeAfterAddingOneGroupSharee(self):
</span><span class="cx"> """
</span><span class="cx"> return group mode after adding one group sharee or None
</span><span class="lines">@@ -2017,19 +2042,14 @@
</span><span class="cx"> @type shareeUID: C{str}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- # Ignore if it already exists
</del><span class="cx"> shareeView = yield self.shareeView(shareeUID)
</span><del>- if shareeView is None:
- shareeView = yield self.createShare(shareeUID=shareeUID, mode=_BIND_MODE_DIRECT, shareName=shareName)
- yield shareeView.newShare()
</del><ins>+ if shareeView is not None and shareeView._bindMode == _BIND_MODE_GROUP:
+ yield self.updateShare(shareeView, mode=_BIND_MODE_DIRECT, status=_BIND_STATUS_ACCEPTED)
+ returnValue(shareeView)
+ else:
+ returnValue((yield super(Calendar, self).directShareWithUser(shareeUID, shareName)))
</ins><span class="cx">
</span><del>- # Check for external
- if shareeView.viewerHome().external():
- yield self._sendExternalInvite(shareeView)
</del><span class="cx">
</span><del>- returnValue(shareeView)
-
-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def uninviteUIDFromShare(self, shareeUID):
</span><span class="cx"> """
</span><span class="lines">@@ -2061,13 +2081,14 @@
</span><span class="cx"> if memberUID != self._home.uid():
</span><span class="cx"> shareeView = yield self.shareeView(memberUID)
</span><span class="cx"> if shareeView is not None:
</span><del>- newMode = yield shareeView._groupModeAfterRemovingOneGroupSharee()
- if newMode is None:
- # only group was shared, do delete share
- yield super(Calendar, self).uninviteUIDFromShare(memberUID)
- else:
- # multiple groups or group and individual was shared, update to new mode
- yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
</del><ins>+ newMode = yield shareeView._groupModeAfterRemovingOneGroupSharee()
+ if newMode is None:
+ if shareeView._bindMode != _BIND_MODE_DIRECT:
+ # one group or individual share: delete share
+ yield super(Calendar, self).uninviteUIDFromShare(memberUID)
+ else:
+ # multiple groups or group and individual was shared, update to new mode
+ yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
</ins><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> shareeView = yield self.shareeView(shareeUID)
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoretesttest_sql_sharingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py (13765 => 13766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py 2014-07-16 20:30:19 UTC (rev 13765)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py 2014-07-16 23:30:52 UTC (rev 13766)
</span><span class="lines">@@ -1277,6 +1277,87 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_accept_uninvite_individual_direct_and_group(self):
+ """
+ Test individual invite + group containing individual invite, accept,
+ then uninvite individual, group.
+ """
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ shareeViewUser07 = yield calendar.directShareWithUser("user07")
+ self.assertNotEqual(shareeViewUser07, None)
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 1)
+ self.assertEqual(invites[0].uid, shareeViewUser07.shareUID())
+ self.assertEqual(invites[0].ownerUID, "user01")
+ self.assertEqual(invites[0].shareeUID, "user07")
+ self.assertEqual(invites[0].mode, _BIND_MODE_DIRECT)
+ self.assertEqual(invites[0].status, _BIND_STATUS_ACCEPTED)
+
+ shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViewsGroup02), 2)
+
+ shareeViewsDict = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViewsGroup02])
+ self.assertEqual(len(shareeViewsDict), 2)
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+ for invite in invites:
+ shareeView = yield calendar.shareeView(invite.shareeUID)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+ self.assertEqual(invite.mode, _BIND_MODE_DIRECT if invite.shareeUID == "user07" else _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_DIRECT if invite.shareeUID == "user07" else _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED if invite.shareeUID == "user07" else _BIND_STATUS_INVITED)
+ self.assertEqual(invite.summary, None)
+ yield self._check_notifications(invite.shareeUID, [] if invite.shareeUID == "user07" else [invite.uid, ])
+
+ yield self.commit()
+
+ # accept
+ for invite in invites:
+ if invite.shareeUID != "user07":
+ shareeHome = yield self.homeUnderTest(name=invite.shareeUID)
+ yield shareeHome.acceptShare(invite.uid)
+
+ yield self._check_notifications("user01", [invite.uid + "-reply" for invite in invites if invite.shareeUID != "user07"])
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ self.assertTrue(calendar.isShared())
+
+ yield self.commit()
+
+ # Uninvite individual
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("user07")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+ for invite in invites:
+ shareeView = yield calendar.shareeView(invite.shareeUID)
+ self.assertNotEqual(shareeView, None)
+ self.assertEqual(invite.uid, shareeView.shareName())
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.mode, _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
+ self.assertEqual(invite.summary, None)
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ # Uninvite group
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group02")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
+
+ for invite in invites:
+ self.assertEqual((yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)), None)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_accept_uninvite_group_and_individual(self):
</span><span class="cx"> """
</span><span class="cx"> Test group + individual contained in group invite, accept, then uninvite group, individual.
</span><span class="lines">@@ -1329,7 +1410,6 @@
</span><span class="cx"> self.assertEqual(len(invites), 1)
</span><span class="cx">
</span><span class="cx"> for invite in invites:
</span><del>- print("invite = %s" % (invite,))
</del><span class="cx"> shareeView = yield calendar.shareeView(invite.shareeUID)
</span><span class="cx"> self.assertNotEqual(shareeView, None)
</span><span class="cx"> self.assertEqual(invite.ownerUID, "user01")
</span><span class="lines">@@ -1353,6 +1433,82 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_accept_uninvite_group_and_individual_direct(self):
+ """
+ Test group + individual contained in group invite, accept, then uninvite group, individual.
+ """
+
+ # Invite
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 0)
+ self.assertFalse(calendar.isShared())
+
+ shareeViewsGroup02 = yield calendar.inviteUIDToShare("group02", _BIND_MODE_READ)
+ self.assertEqual(len(shareeViewsGroup02), 3)
+ shareeViewsDict = dict([(shareeView.shareUID(), shareeView) for shareeView in shareeViewsGroup02])
+ self.assertEqual(len(shareeViewsDict), 3)
+ shareeViewUser07 = yield calendar.directShareWithUser("user07")
+ self.assertNotEqual(shareeViewUser07, None)
+
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 3)
+ for invite in invites:
+ shareeView = yield calendar.shareeView(invite.shareeUID)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.shareeUID, shareeView.viewerHome().uid())
+ self.assertEqual(invite.mode, _BIND_MODE_DIRECT if invite.shareeUID == "user07" else _BIND_MODE_GROUP)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_DIRECT if invite.shareeUID == "user07" else _BIND_MODE_READ)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED if invite.shareeUID == "user07" else _BIND_STATUS_INVITED)
+ self.assertEqual(invite.summary, None)
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
+ # accept
+ for invite in invites:
+ if invite.shareeUID != "user07":
+ shareeHome = yield self.homeUnderTest(name=invite.shareeUID)
+ yield shareeHome.acceptShare(invite.uid)
+
+ yield self._check_notifications("user01", [invite.uid + "-reply" for invite in invites if invite.shareeUID != "user07"])
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ self.assertTrue(calendar.isShared())
+
+ yield self.commit()
+
+ # Uninvite group
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("group02")
+ invites = yield calendar.sharingInvites()
+ self.assertEqual(len(invites), 1)
+
+ for invite in invites:
+ shareeView = yield calendar.shareeView(invite.shareeUID)
+ self.assertEqual(invites[0].ownerUID, "user01")
+ self.assertNotEqual(shareeView, None)
+ self.assertEqual(invite.ownerUID, "user01")
+ self.assertEqual(invite.uid, shareeView.shareName())
+ self.assertEqual(invite.mode, _BIND_MODE_DIRECT)
+ self.assertEqual((yield shareeView.effectiveShareMode()), _BIND_MODE_DIRECT)
+ self.assertEqual(invite.status, _BIND_STATUS_ACCEPTED)
+ self.assertEqual(invite.summary, None)
+ yield self._check_notifications(invite.shareeUID, [invite.uid, ])
+
+ yield self.commit()
+
+ # Uninvite individual
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield calendar.uninviteUIDFromShare("user07")
+ noinvites = yield calendar.sharingInvites()
+ self.assertEqual(len(noinvites), 0)
+
+ for invite in invites:
+ self.assertEqual((yield self.calendarUnderTest(home=invite.shareeUID, name=invite.uid)), None)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_accept_uninvite_individual_and_groups(self):
</span><span class="cx"> """
</span><span class="cx"> Test individual invite + 2 group containing individual invite, accept, then uninvite individual, groups.
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2txdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py (13765 => 13766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py 2014-07-16 20:30:19 UTC (rev 13765)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py 2014-07-16 23:30:52 UTC (rev 13766)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> from txdav.common.datastore.common import HomeChildBase
</span><span class="cx"> from txdav.common.datastore.podding.conduit import PoddingConduit
</span><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_MODE_DIRECT, \
</span><del>- _BIND_MODE_GROUP, _BIND_MODE_GROUP_READ, _BIND_MODE_GROUP_WRITE, \
</del><span class="cx"> _BIND_MODE_INDIRECT, _BIND_MODE_OWN, _BIND_STATUS_ACCEPTED, \
</span><span class="cx"> _BIND_STATUS_DECLINED, _BIND_STATUS_DELETED, _BIND_STATUS_INVALID, \
</span><span class="cx"> _BIND_STATUS_INVITED, _HOME_STATUS_EXTERNAL, _HOME_STATUS_NORMAL, \
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2txdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/who/groups.py (13765 => 13766)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/who/groups.py 2014-07-16 20:30:19 UTC (rev 13765)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/who/groups.py 2014-07-16 23:30:52 UTC (rev 13766)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> from txdav.caldav.datastore.sql import CalendarStoreFeatures, ComponentUpdateState
</span><span class="cx"> from txdav.common.datastore.sql_tables import schema, _BIND_MODE_OWN
</span><span class="cx"> import datetime
</span><del>-import hashlib
</del><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -244,7 +243,7 @@
</span><span class="cx"> rows = yield Select(
</span><span class="cx"> [bind.HOME_RESOURCE_ID],
</span><span class="cx"> From=bind,
</span><del>- Where=bind.CALENDAR_RESOURCE_ID == self.calendarID.And(
</del><ins>+ Where=(bind.CALENDAR_RESOURCE_ID == self.calendarID).And(
</ins><span class="cx"> bind.BIND_MODE == _BIND_MODE_OWN
</span><span class="cx"> ),
</span><span class="cx"> ).on(self.transaction)
</span><span class="lines">@@ -252,11 +251,11 @@
</span><span class="cx"> homeID = rows[0][0]
</span><span class="cx"> home = yield self.transaction.calendarHomeWithResourceID(homeID)
</span><span class="cx"> calendar = yield home.childWithID(self.calendarID)
</span><ins>+ groupUID = ((yield self.transaction.groupByID(self.groupID)))[0]
+ yield calendar.reconcileGroupSharee(groupUID)
</ins><span class="cx">
</span><del>- yield calendar.reconcileGroupSharee(self.groupUID)
</del><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def diffAssignments(old, new):
</span><span class="cx"> """
</span><span class="cx"> Compare two proxy assignment lists and return their differences in the form
</span><span class="lines">@@ -384,11 +383,11 @@
</span><span class="cx"> groupID, membershipChanged = yield txn.refreshGroup(groupUID)
</span><span class="cx">
</span><span class="cx"> if membershipChanged:
</span><del>- wps = yield self.scheduleGroupAttendeeReconciliations(txn, groupID)
- else:
- wps = ()
</del><ins>+ wpsAttendee = yield self.scheduleGroupAttendeeReconciliations(txn, groupID)
+ wpsShareee = yield self.scheduleGroupShareeReconciliations(txn, groupID)
+ returnValue(wpsAttendee + wpsShareee)
</ins><span class="cx">
</span><del>- returnValue(wps)
</del><ins>+ returnValue(tuple())
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def synchronizeMembers(self, txn, groupID, newMemberUIDs):
</span><span class="lines">@@ -508,4 +507,4 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: is this a good place to clear out unreferenced groups?
</span><span class="cx">
</span><del>- returnValue((delegatedUIDs | attendeeGroupUIDs | shareeGroupUIDs))
</del><ins>+ returnValue(frozenset(delegatedUIDs | attendeeGroupUIDs | shareeGroupUIDs))
</ins></span></pre>
</div>
</div>
</body>
</html>