Diff
Modified: CalendarServer/trunk/twistedcaldav/directory/calendar.py (3596 => 3597)
--- CalendarServer/trunk/twistedcaldav/directory/calendar.py 2009-01-19 23:19:13 UTC (rev 3596)
+++ CalendarServer/trunk/twistedcaldav/directory/calendar.py 2009-01-19 23:23:00 UTC (rev 3597)
@@ -60,11 +60,7 @@
def defaultAccessControlList(self):
return config.ProvisioningResourceACL
- 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 DirectoryCalendarHomeProvisioningResource (DirectoryCalendarProvisioningResource):
"""
Resource which provisions calendar home collections as needed.
Modified: CalendarServer/trunk/twistedcaldav/extensions.py (3596 => 3597)
--- CalendarServer/trunk/twistedcaldav/extensions.py 2009-01-19 23:19:13 UTC (rev 3596)
+++ CalendarServer/trunk/twistedcaldav/extensions.py 2009-01-19 23:23:00 UTC (rev 3597)
@@ -906,6 +906,13 @@
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
+ # inheritance rules, etc.
+ return succeed(self.defaultAccessControlList())
+
class XMLResponse (Response):
"""
XML L{Response} object.
Modified: CalendarServer/trunk/twistedcaldav/root.py (3596 => 3597)
--- CalendarServer/trunk/twistedcaldav/root.py 2009-01-19 23:19:13 UTC (rev 3596)
+++ CalendarServer/trunk/twistedcaldav/root.py 2009-01-19 23:23:00 UTC (rev 3597)
@@ -40,7 +40,7 @@
log = Logger()
-class RootResource (DirectoryPrincipalPropertySearchMixIn, DAVFile):
+class RootResource (ReadOnlyResourceMixIn, DirectoryPrincipalPropertySearchMixIn, DAVFile):
"""
A special root resource that contains support checking SACLs
as well as adding responseFilters.
@@ -91,13 +91,6 @@
def defaultAccessControlList(self):
return config.RootResourceACL
- def accessControlList(
- self, request, inheritance=True, expanding=False, inherited_aces=None
- ):
- # Permissions here are fixed, and are not subject to
- # inheritance rules, etc.
- return succeed(self.defaultAccessControlList())
-
@inlineCallbacks
def checkSacl(self, request):
"""