[CalendarServer-changes] [10585] CalendarServer/branches/users/glyph/unshare-when-access-revoked

[source_changes at macosforge.org]

Revision: 10585
          http://trac.calendarserver.org//changeset/10585
Author:   glyph at apple.com
Date:     2013-01-28 19:29:11 -0800 (Mon, 28 Jan 2013)
Log Message:
-----------
Give provisionShare the ability to remove the resource; correct type information on Share

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/resource.py
    CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/sharing.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/unshare-when-access-revoked/

Modified: CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/resource.py
===================================================================
--- CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/resource.py	2013-01-29 03:29:09 UTC (rev 10584)
+++ CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/resource.py	2013-01-29 03:29:11 UTC (rev 10585)
@@ -2261,10 +2261,11 @@
             returnValue(child)
 
         # get regular or shared child
-        child = (yield self.makeRegularChild(name))
+        child = yield self.makeRegularChild(name)
 
-        # add _share attribute if child is shared
-        yield self.provisionShare(child)
+        # add _share attribute if child is shared; verify that child should
+        # still be accessible and convert it to None if it's not.
+        child = yield self.provisionShare(child)
 
         returnValue(child)
 

Modified: CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/sharing.py	2013-01-29 03:29:09 UTC (rev 10584)
+++ CalendarServer/branches/users/glyph/unshare-when-access-revoked/twistedcaldav/sharing.py	2013-01-29 03:29:11 UTC (rev 10585)
@@ -1037,6 +1037,7 @@
         share = yield self._shareForHomeChild(child._newStoreObject, request)
         if share:
             child.setShare(share)
+        returnValue(child)
 
 
     @inlineCallbacks
@@ -1402,16 +1403,15 @@
 
     def __init__(self, sharerHomeChild, shareeHomeChild, url):
         """
-        @param sharerHomeChild: The HTTP resource representing the shared
+        @param sharerHomeChild: The data store object representing the shared
             collection as present in the owner's home collection; the owner's
             reference.
-        @type sharerHomeChild: L{twistedcaldav.resource.CalDAVResource}
+        @type sharerHomeChild: L{txdav.caldav.icalendarstore.ICalendar}
 
         @param shareeHomeChild: The data store object representing the
             collection as present in the sharee's home collection; the sharee's
             reference.
-        @type shareeHomeChild:
-            L{txdav.common.icommondatastore.IShareableCollection}
+        @type shareeHomeChild: L{txdav.caldav.icalendarstore.ICalendar}
 
         @param url: The URL referring to the sharer's version of the resource.
         @type url: L{bytes}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130128/fc2a538d/attachment.html>