[CalendarServer-changes] [13735] CalendarServer/branches/users/gaya/groupsharee2
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 8 13:21:56 PDT 2014
Revision: 13735
http://trac.calendarserver.org//changeset/13735
Author: gaya at apple.com
Date: 2014-07-08 13:21:56 -0700 (Tue, 08 Jul 2014)
Log Message:
-----------
inviteUserToShare -> inviteUIDToShare; uninviteUserFromShare -> uninviteUIDFromShare
Modified Paths:
--------------
CalendarServer/branches/users/gaya/groupsharee2/calendarserver/push/test/test_notifier.py
CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/sharing.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_external.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/carddav/datastore/test/test_sql_sharing.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/podding/test/test_conduit.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/podding/test/util.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/work/test/test_revision_cleanup.py
Modified: CalendarServer/branches/users/gaya/groupsharee2/calendarserver/push/test/test_notifier.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/calendarserver/push/test/test_notifier.py 2014-07-08 17:58:03 UTC (rev 13734)
+++ CalendarServer/branches/users/gaya/groupsharee2/calendarserver/push/test/test_notifier.py 2014-07-08 20:21:56 UTC (rev 13735)
@@ -228,7 +228,7 @@
def test_shareWithNotifier(self):
calendar = yield self.calendarUnderTest(home="user01")
- yield calendar.inviteUserToShare("user02", _BIND_MODE_WRITE, "")
+ yield calendar.inviteUIDToShare("user02", _BIND_MODE_WRITE, "")
self.assertEquals(
set(self.notifierFactory.history),
set([
@@ -241,7 +241,7 @@
yield self.commit()
calendar = yield self.calendarUnderTest(home="user01")
- yield calendar.uninviteUserFromShare("user02")
+ yield calendar.uninviteUIDFromShare("user02")
self.assertEquals(
set(self.notifierFactory.history),
set([
@@ -258,7 +258,7 @@
def test_sharedCalendarNotifier(self):
calendar = yield self.calendarUnderTest(home="user01")
- shareeView = yield calendar.inviteUserToShare("user02", _BIND_MODE_WRITE, "")
+ shareeView = yield calendar.inviteUIDToShare("user02", _BIND_MODE_WRITE, "")
yield shareeView.acceptShare("")
shareName = shareeView.name()
yield self.commit()
Modified: CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/sharing.py 2014-07-08 17:58:03 UTC (rev 13734)
+++ CalendarServer/branches/users/gaya/groupsharee2/twistedcaldav/sharing.py 2014-07-08 20:21:56 UTC (rev 13735)
@@ -131,7 +131,7 @@
# Remove all invitees
for invitation in (yield self._newStoreObject.allInvitations()):
- yield self._newStoreObject.uninviteUserFromShare(invitation.shareeUID)
+ yield self._newStoreObject.uninviteUIDFromShare(invitation.shareeUID)
returnValue(True)
@@ -452,7 +452,7 @@
returnValue(adjusted_invitations)
- def inviteUserToShare(self, userid, cn, ace, summary, request):
+ def inviteUIDToShare(self, userid, cn, ace, summary, request):
""" Send out in invite first, and then add this user to the share list
@param userid:
@param ace: Must be one of customxml.ReadWriteAccess or customxml.ReadAccess
@@ -470,7 +470,7 @@
return self._processShareActionList(dl, resultIsList)
- def uninviteUserFromShare(self, userid, ace, request):
+ def uninviteUIDFromShare(self, userid, ace, request):
"""
Send out in uninvite first, and then remove this user from the share list.
"""
@@ -516,7 +516,7 @@
if not sharee:
returnValue(False)
- result = (yield self._newStoreObject.inviteUserToShare(
+ result = (yield self._newStoreObject.inviteUIDToShare(
sharee.principalUID(),
invitationBindModeFromXMLMap[type(ace)],
summary,
@@ -539,7 +539,7 @@
else:
returnValue(False)
- result = (yield self._newStoreObject.uninviteUserFromShare(uid))
+ result = (yield self._newStoreObject.uninviteUIDFromShare(uid))
returnValue(result)
@@ -661,12 +661,12 @@
del removeDict[u]
del setDict[u]
for userid, access in removeDict.iteritems():
- result = (yield self.uninviteUserFromShare(userid, access, request))
+ result = (yield self.uninviteUIDFromShare(userid, access, request))
# If result is False that means the user being removed was not
# actually invited, but let's not return an error in this case.
okusers.add(userid)
for userid, (cn, access, summary) in setDict.iteritems():
- result = (yield self.inviteUserToShare(userid, cn, access, summary, request))
+ result = (yield self.inviteUIDToShare(userid, cn, access, summary, request))
(okusers if result else badusers).add(userid)
for userid, (cn, removeACL, newACL, summary) in updateinviteDict.iteritems():
result = (yield self.inviteUserUpdateToShare(userid, cn, removeACL, newACL, summary, request))
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-08 17:58:03 UTC (rev 13734)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-08 20:21:56 UTC (rev 13735)
@@ -1993,7 +1993,7 @@
# Higher level API
#
@inlineCallbacks
- def inviteUserToShare(self, shareeUID, mode, summary, shareName=None):
+ def inviteUIDToShare(self, shareeUID, mode, summary, shareName=None):
"""
Invite a user to share this collection - either create the share if it does not exist, or
update the existing share with new values. Make sure a notification is sent as well.
@@ -2006,23 +2006,31 @@
@type summary: C{str}
"""
- # Look for existing invite and update its fields or create new one
- shareeView = yield self.shareeView(shareeUID)
- if shareeView is not None:
- status = _BIND_STATUS_INVITED if shareeView.shareStatus() in (_BIND_STATUS_DECLINED, _BIND_STATUS_INVALID) else None
- yield self.updateShare(shareeView, mode=mode, status=status, summary=summary)
- else:
- shareeView = yield self.createShare(shareeUID=shareeUID, mode=mode, summary=summary, shareName=shareName)
+ record = yield self._txn.directoryService().recordWithUID(shareeUID.decode("utf-8"))
+ if (
+ record is None or
+ record.type() != RecordType.group or not (False and
+ config.Sharing.Enabled and
+ config.Sharing.Calendars.Enabled and
+ config.Sharing.Calendars.Groups.Enabled
+ )
+ ):
+ returnValue(
+ (yield super(Calendar, self).inviteUIDToShare(shareeUID, mode, summary, shareName))
+ )
- # Check for external
- if shareeView.viewerHome().external():
- yield self._sendExternalInvite(shareeView)
- else:
- # Send invite notification
- yield self._sendInviteNotification(shareeView)
- returnValue(shareeView)
+ # invite every member of group
+ groupID = (yield self._txn.groupByUID(record.uid))[0]
+ memberUIDs = yield self._txn.groupMemberUIDs(groupID)
+ for memberUID in memberUIDs:
+ shareeView = yield self.shareeView(shareeUID)
+ if shareeView is None:
+ yield super(Calendar, self).inviteUIDToShare(memberUID, _BIND_MODE_GROUP, summary, shareName)
+ # FIX ME:
+ returnValue(None)
+
@inlineCallbacks
def directShareWithUser(self, shareeUID, shareName=None):
"""
@@ -2050,7 +2058,7 @@
@inlineCallbacks
- def uninviteUserFromShare(self, shareeUID):
+ def uninviteUIDFromShare(self, shareeUID):
"""
Remove a user from a share. Make sure a notification is sent as well.
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_external.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_external.py 2014-07-08 17:58:03 UTC (rev 13734)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_external.py 2014-07-08 20:21:56 UTC (rev 13735)
@@ -108,7 +108,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(calendar.isShared())
- shareeView = yield calendar.inviteUserToShare("puser02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("puser02", _BIND_MODE_READ, "summary")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
self.assertEqual(invites[0].uid, shareeView.shareUID())
@@ -138,7 +138,7 @@
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
- yield calendar.uninviteUserFromShare("puser02")
+ yield calendar.uninviteUIDFromShare("puser02")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 0)
@@ -169,7 +169,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(calendar.isShared())
- shareeView = yield calendar.inviteUserToShare("puser02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("puser02", _BIND_MODE_READ, "summary")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
@@ -235,7 +235,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(calendar.isShared())
- shareeView = yield calendar.inviteUserToShare("puser02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("puser02", _BIND_MODE_READ, "summary")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
@@ -303,7 +303,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(calendar.isShared())
- shareeView = yield calendar.inviteUserToShare("puser02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("puser02", _BIND_MODE_READ, "summary")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -370,7 +370,7 @@
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 0)
- shareeView = yield calendar.inviteUserToShare("puser02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("puser02", _BIND_MODE_READ, "summary")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
@@ -598,7 +598,7 @@
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 0)
- shareeView = yield calendar.inviteUserToShare("puser02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("puser02", _BIND_MODE_READ, "summary")
newCalName = shareeView.shareUID()
yield self.commit()
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py 2014-07-08 17:58:03 UTC (rev 13734)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/test/test_sql_sharing.py 2014-07-08 20:21:56 UTC (rev 13735)
@@ -100,7 +100,7 @@
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 0)
- shareeView = yield calendar.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
inviteUID = shareeView.shareUID()
yield self.commit()
@@ -140,7 +140,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(calendar.isShared())
- shareeView = yield calendar.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
self.assertEqual(invites[0].uid, shareeView.shareUID())
@@ -168,7 +168,7 @@
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
- yield calendar.uninviteUserFromShare("user02")
+ yield calendar.uninviteUIDFromShare("user02")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 0)
@@ -198,7 +198,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(calendar.isShared())
- shareeView = yield calendar.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -258,7 +258,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(calendar.isShared())
- shareeView = yield calendar.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -319,7 +319,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(calendar.isShared())
- shareeView = yield calendar.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -379,7 +379,7 @@
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 0)
- shareeView = yield calendar.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -609,7 +609,7 @@
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 0)
- shareeView = yield calendar.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
newCalName = shareeView.shareUID()
yield self.commit()
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/carddav/datastore/test/test_sql_sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/carddav/datastore/test/test_sql_sharing.py 2014-07-08 17:58:03 UTC (rev 13734)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/carddav/datastore/test/test_sql_sharing.py 2014-07-08 20:21:56 UTC (rev 13735)
@@ -150,7 +150,7 @@
invites = yield addressbook.sharingInvites()
self.assertEqual(len(invites), 0)
- shareeView = yield addressbook.inviteUserToShare("user02", mode, "summary")
+ shareeView = yield addressbook.inviteUIDToShare("user02", mode, "summary")
inviteUID = shareeView.shareUID()
yield self.commit()
@@ -179,7 +179,7 @@
def _inviteGroupShare(self, groupname="group1.vcf", mode=_BIND_MODE_READ):
# Invite
group = yield self.addressbookObjectUnderTest(home="user01", addressbook_name="addressbook", name=groupname)
- shareeView = yield group.inviteUserToShare("user02", mode, "summary")
+ shareeView = yield group.inviteUIDToShare("user02", mode, "summary")
inviteUID = shareeView.shareUID()
yield self.commit()
@@ -264,7 +264,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(addressbook.isShared())
- shareeView = yield addressbook.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield addressbook.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield addressbook.sharingInvites()
self.assertEqual(len(invites), 1)
self.assertEqual(invites[0].uid, shareeView.shareUID())
@@ -291,7 +291,7 @@
self.assertEqual(len(invites), 1)
self.assertTrue(addressbook.isShared())
- yield addressbook.uninviteUserFromShare("user02")
+ yield addressbook.uninviteUIDFromShare("user02")
invites = yield addressbook.sharingInvites()
self.assertEqual(len(invites), 0)
@@ -317,7 +317,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(addressbook.isShared())
- shareeView = yield addressbook.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield addressbook.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield addressbook.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -373,7 +373,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(addressbook.isShared())
- shareeView = yield addressbook.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield addressbook.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield addressbook.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -427,7 +427,7 @@
invites = yield addressbook.sharingInvites()
self.assertEqual(len(invites), 0)
- shareeView = yield addressbook.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield addressbook.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield addressbook.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -474,7 +474,7 @@
invites = yield addressbook.sharingInvites()
self.assertEqual(len(invites), 0)
- shareeView = yield addressbook.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield addressbook.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield addressbook.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -595,7 +595,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(group.isShared())
- shareeView = yield group.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield group.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield group.sharingInvites()
self.assertEqual(len(invites), 1)
self.assertEqual(invites[0].uid, shareeView.shareUID())
@@ -626,7 +626,7 @@
self.assertEqual(len(invites), 1)
self.assertTrue(group.isShared())
- yield group.uninviteUserFromShare("user02")
+ yield group.uninviteUIDFromShare("user02")
invites = yield group.sharingInvites()
self.assertEqual(len(invites), 0)
self.assertTrue(group.isShared())
@@ -651,7 +651,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(group.isShared())
- shareeView = yield group.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield group.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield group.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -700,7 +700,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(group.isShared())
- shareeView = yield group.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield group.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield group.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -754,7 +754,7 @@
self.assertEqual(len(invites), 0)
self.assertFalse(group.isShared())
- shareeView = yield group.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield group.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield group.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -805,7 +805,7 @@
invites = yield group.sharingInvites()
self.assertEqual(len(invites), 0)
- shareeView = yield group.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield group.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
invites = yield group.sharingInvites()
self.assertEqual(len(invites), 1)
inviteUID = shareeView.shareUID()
@@ -867,7 +867,7 @@
# Uninvite one
group = yield self.addressbookObjectUnderTest(home="user01", addressbook_name="addressbook", name="group1.vcf")
- yield group.uninviteUserFromShare("user02")
+ yield group.uninviteUIDFromShare("user02")
invites = yield group.sharingInvites()
self.assertEqual(len(invites), 0)
@@ -882,7 +882,7 @@
# Uninvite other
group = yield self.addressbookObjectUnderTest(home="user02", addressbook_name="user01", name="group2.vcf")
- yield group.uninviteUserFromShare("user02")
+ yield group.uninviteUIDFromShare("user02")
invites = yield group.sharingInvites()
self.assertEqual(len(invites), 0)
@@ -1002,7 +1002,7 @@
# Uninvite group1
group = yield self.addressbookObjectUnderTest(home="user01", addressbook_name="addressbook", name="group1.vcf")
- yield group.uninviteUserFromShare("user02")
+ yield group.uninviteUIDFromShare("user02")
yield self._check_addressbook("user02", "user01", self.fully_shared_children)
yield self._check_read_only("user02", "user01", ["group1.vcf", "card2.vcf", ])
@@ -1010,7 +1010,7 @@
# Uninvite group2
group = yield self.addressbookObjectUnderTest(home="user01", addressbook_name="addressbook", name="group2.vcf")
- yield group.uninviteUserFromShare("user02")
+ yield group.uninviteUIDFromShare("user02")
yield self._check_addressbook("user02", "user01", self.fully_shared_children)
yield self._check_read_only("user02", "user01", self.all_children)
@@ -1029,7 +1029,7 @@
# Add group1 read-write - but do not accept
group = yield self.addressbookObjectUnderTest(home="user01", addressbook_name="addressbook", name="group1.vcf")
- invited = yield group.inviteUserToShare("user02", _BIND_MODE_WRITE, "summary")
+ invited = yield group.inviteUIDToShare("user02", _BIND_MODE_WRITE, "summary")
yield self._check_notifications("user02", [shareeName, invited.shareUID(), ])
yield self._check_addressbook("user02", "user01", self.fully_shared_children)
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/podding/test/test_conduit.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/podding/test/test_conduit.py 2014-07-08 17:58:03 UTC (rev 13734)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/podding/test/test_conduit.py 2014-07-08 20:21:56 UTC (rev 13735)
@@ -284,7 +284,7 @@
yield self.otherCommit()
calendar1 = yield self.calendarUnderTest(home="user01", name="calendar")
- yield calendar1.uninviteUserFromShare("puser01")
+ yield calendar1.uninviteUIDFromShare("puser01")
yield self.commit()
shared = yield self.calendarUnderTest(txn=self.newOtherTransaction(), home="puser01", name="shared-calendar")
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/podding/test/util.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/podding/test/util.py 2014-07-08 17:58:03 UTC (rev 13734)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/podding/test/util.py 2014-07-08 20:21:56 UTC (rev 13735)
@@ -193,7 +193,7 @@
home = yield self.homeUnderTest(name=ownerGUID, create=True)
calendar = yield home.calendarWithName(name)
- yield calendar.inviteUserToShare(shareeGUID, _BIND_MODE_WRITE, "shared", shareName="shared-calendar")
+ yield calendar.inviteUIDToShare(shareeGUID, _BIND_MODE_WRITE, "shared", shareName="shared-calendar")
yield self.commit()
# ACK: home2 is None
@@ -209,5 +209,5 @@
home = yield self.homeUnderTest(name=ownerGUID)
calendar = yield home.calendarWithName(name)
- yield calendar.uninviteUserFromShare(shareeGUID)
+ yield calendar.uninviteUIDFromShare(shareeGUID)
yield self.commit()
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py 2014-07-08 17:58:03 UTC (rev 13734)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py 2014-07-08 20:21:56 UTC (rev 13735)
@@ -2901,7 +2901,7 @@
self.uid(), shareName=shareUID
)
else:
- shareeView = yield ownerView.inviteUserToShare(
+ shareeView = yield ownerView.inviteUIDToShare(
self.uid(), bindMode, summary, shareName=shareUID
)
@@ -2925,7 +2925,7 @@
raise ExternalShareFailed("Invalid share ID: {}".format(shareUID))
# Now carry out the share operation
- yield ownerView.uninviteUserFromShare(self.uid())
+ yield ownerView.uninviteUIDFromShare(self.uid())
# See if there are any references to the external share. If not,
# remove it
@@ -4563,7 +4563,7 @@
# Higher level API
#
@inlineCallbacks
- def inviteUserToShare(self, shareeUID, mode, summary, shareName=None):
+ def inviteUIDToShare(self, shareeUID, mode, summary, shareName=None):
"""
Invite a user to share this collection - either create the share if it does not exist, or
update the existing share with new values. Make sure a notification is sent as well.
@@ -4620,7 +4620,7 @@
@inlineCallbacks
- def uninviteUserFromShare(self, shareeUID):
+ def uninviteUIDFromShare(self, shareeUID):
"""
Remove a user from a share. Make sure a notification is sent as well.
@@ -4703,7 +4703,7 @@
# Remove all sharees (direct and invited)
for invitation in (yield self.sharingInvites()):
- yield self.uninviteUserFromShare(invitation.shareeUID)
+ yield self.uninviteUIDFromShare(invitation.shareeUID)
def newShare(self, displayname=None):
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/work/test/test_revision_cleanup.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/work/test/test_revision_cleanup.py 2014-07-08 17:58:03 UTC (rev 13734)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/work/test/test_revision_cleanup.py 2014-07-08 20:21:56 UTC (rev 13735)
@@ -223,7 +223,7 @@
invites = yield calendar.sharingInvites()
self.assertEqual(len(invites), 0)
- shareeView = yield calendar.inviteUserToShare("user02", _BIND_MODE_READ, "summary")
+ shareeView = yield calendar.inviteUIDToShare("user02", _BIND_MODE_READ, "summary")
inviteUID = shareeView.shareUID()
yield self.commit()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140708/0fc3188f/attachment-0001.html>
More information about the calendarserver-changes
mailing list