[CalendarServer-changes] [2213] CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav

[source_changes at macosforge.org]

Revision: 2213
          http://trac.macosforge.org/projects/calendarserver/changeset/2213
Author:   wsanchez at apple.com
Date:     2008-03-07 10:25:01 -0800 (Fri, 07 Mar 2008)

Log Message:
-----------
Don't define accessControlList() in ReadOnlyResourceMixIn because it breaks inheritance.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/directory/principal.py
    CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/extensions.py

Modified: CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/directory/principal.py	2008-03-07 18:20:39 UTC (rev 2212)
+++ CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/directory/principal.py	2008-03-07 18:25:01 UTC (rev 2213)
@@ -60,6 +60,10 @@
     def defaultAccessControlList(self):
         return authReadACL
 
+    def accessControlList(self, request, inheritance=True, expanding=False, inherited_aces=None):
+        # Permissions here are fixed, and are not subject to inherritance rules, etc.
+        return succeed(self.defaultAccessControlList())
+
 class DirectoryProvisioningResource (
     AutoProvisioningFileMixIn,
     PermissionsMixIn,

Modified: CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/extensions.py	2008-03-07 18:20:39 UTC (rev 2212)
+++ CalendarServer/branches/users/wsanchez/guid-calendars/twistedcaldav/extensions.py	2008-03-07 18:25:01 UTC (rev 2213)
@@ -620,10 +620,6 @@
     def writeProperty(self, property, request):
         raise HTTPError(self.readOnlyResponse)
 
-    def accessControlList(self, request, inheritance=True, expanding=False, inherited_aces=None):
-        # Permissions here are fixed, and are not subject to inherritance rules, etc.
-        return succeed(self.defaultAccessControlList())
-
 class XMLResponse (Response):
     """
     XML L{Response} object.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080307/ced381f4/attachment-0001.html