[CalendarServer-changes] [9428] CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing .py
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 10 18:17:35 PDT 2012
Revision: 9428
http://trac.macosforge.org/projects/calendarserver/changeset/9428
Author: gaya at apple.com
Date: 2012-07-10 18:17:35 -0700 (Tue, 10 Jul 2012)
Log Message:
-----------
in Invite(), ignore the userid param and set it to "urn:uuid:" + principalUID. userid comes from INVITE table RECIPIENT_ADDRESS, so this change ignores RECIPIENT_ADDRESS so that it can be removed in the future.
Modified Paths:
--------------
CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py
Modified: CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py 2012-07-11 00:58:27 UTC (rev 9427)
+++ CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py 2012-07-11 01:17:35 UTC (rev 9428)
@@ -496,6 +496,7 @@
principalUID = principal.principalUID()
# add code below to convert from "mailto:" + xxxx form of userid
# userid = "urn:uuid:" + principalUID
+ # NOTE: userid is currently ignored by Invite(), so change above is not needed
cn = principal.displayName()
# Acquire a memcache lock based on collection URL and sharee UID
@@ -859,7 +860,10 @@
def __init__(self, inviteuid, userid, principalUID, common_name, access, state, summary):
self.inviteuid = inviteuid
- self.userid = userid
+ # self.userid = userid
+ # generate userid from principalUID
+ self.userid = "urn:uuid:" + principalUID
+ # TODO: Get rid of userid completely.
self.principalUID = principalUID
self.name = common_name
self.access = access
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120710/3a705abd/attachment.html>
More information about the calendarserver-changes
mailing list