[CalendarServer-changes] [943] CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav

[source_changes at macosforge.org]

Revision: 943
          http://trac.macosforge.org/projects/calendarserver/changeset/943
Author:   cdaboo at apple.com
Date:     2007-01-05 13:00:32 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
Clean up principalForRecord lookup, by calling up the parent chain, rather than hard-coding parent chain attributes.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/calendar.py
    CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/schedule.py

Modified: CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/calendar.py	2007-01-05 20:59:04 UTC (rev 942)
+++ CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/calendar.py	2007-01-05 21:00:32 UTC (rev 943)
@@ -81,6 +81,11 @@
         # See DirectoryPrincipalProvisioningResource.__init__()
         return self.directory.principalCollection.principalCollections()
 
+    def principalForRecord(self, record):
+        # FIXME: directory.principalCollection smells like a hack
+        # See DirectoryPrincipalProvisioningResource.__init__()
+        return self.directory.principalCollection.principalForRecord(record)
+
     def homeForDirectoryRecord(self, record):
         typeResource = self.getChild(record.recordType)
         if typeResource is None:
@@ -161,6 +166,10 @@
     def principalCollections(self):
         return self._parent.principalCollections()
 
+    def principalForRecord(self, record):
+        return self._parent.principalForRecord(record)
+
+
 class DirectoryCalendarHomeResource (AutoProvisioningResourceMixIn, CalDAVResource):
     """
     Calendar home collection resource.
@@ -254,7 +263,7 @@
     def defaultAccessControlList(self):
         # FIXME: directory.principalCollection smells like a hack
         # See DirectoryPrincipalProvisioningResource.__init__()
-        myPrincipal = self._parent._parent.directory.principalCollection.principalForRecord(self.record)
+        myPrincipal = self.principalForRecord()
 
         aces = (
             # DAV:read access for authenticated users.
@@ -294,6 +303,9 @@
     def principalCollections(self):
         return self._parent.principalCollections()
 
+    def principalForRecord(self):
+        return self._parent.principalForRecord(self.record)
+
     ##
     # Quota
     ##

Modified: CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/schedule.py	2007-01-05 20:59:04 UTC (rev 942)
+++ CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/schedule.py	2007-01-05 21:00:32 UTC (rev 943)
@@ -105,9 +105,7 @@
 
     def defaultAccessControlList(self):
         if config.CalendarUserProxyEnabled:
-            # FIXME: directory.principalCollection smells like a hack
-            # See DirectoryPrincipalProvisioningResource.__init__()
-            myPrincipal = self._parent._parent._parent.directory.principalCollection.principalForRecord(self.record)
+            myPrincipal = self.parent.principalForRecord()
     
             return davxml.ACL(
                 # CalDAV:schedule for associated write proxies

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