[CalendarServer-changes] [4042] CalendarServer/branches/users/sagen/resource-delegates-4038/ twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 4042
          http://trac.macosforge.org/projects/calendarserver/changeset/4042
Author:   sagen at apple.com
Date:     2009-04-18 21:40:10 -0700 (Sat, 18 Apr 2009)
Log Message:
-----------
Starting to move resource/locations' delegates from directory to database

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/cachingappleopendirectory.py
    CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/directory.py

Modified: CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/cachingappleopendirectory.py
===================================================================
--- CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/cachingappleopendirectory.py	2009-04-19 00:36:29 UTC (rev 4041)
+++ CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/cachingappleopendirectory.py	2009-04-19 04:40:10 UTC (rev 4042)
@@ -477,10 +477,12 @@
     
             elif recordType == DirectoryService.recordType_locations:
                 listRecordTypes.append(dsattributes.kDSStdRecordTypePlaces)
+                # MOR: possibly can be removed
                 attrs.append(dsattributes.kDSNAttrResourceInfo)
             
             elif recordType == DirectoryService.recordType_resources:
                 listRecordTypes.append(dsattributes.kDSStdRecordTypeResources)
+                # MOR: possibly can be removed
                 attrs.append(dsattributes.kDSNAttrResourceInfo)
             
             else:
@@ -657,10 +659,13 @@
             else:
                 memberGUIDs = ()
 
-            # Special case for resources and locations
             autoSchedule = False
             proxyGUIDs = ()
             readOnlyProxyGUIDs = ()
+
+            # MOR:
+            # Special case for resources and locations
+            """
             if recordType in (self.recordType_resources, self.recordType_locations):
                 resourceInfo = value.get(dsattributes.kDSNAttrResourceInfo)
                 if resourceInfo is not None:
@@ -672,6 +677,7 @@
                         proxyGUIDs = (proxy,)
                     if read_only_proxy:
                         readOnlyProxyGUIDs = (read_only_proxy,)
+            """
 
             record = OpenDirectoryRecord(
                 service               = self,

Modified: CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/directory.py	2009-04-19 00:36:29 UTC (rev 4041)
+++ CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/directory.py	2009-04-19 04:40:10 UTC (rev 4042)
@@ -348,7 +348,9 @@
         return ()
 
     def hasEditableProxyMembership(self):
-        return self.recordType in (DirectoryService.recordType_users, DirectoryService.recordType_groups)
+        return True
+        # MOR:
+        # return self.recordType in (DirectoryService.recordType_users, DirectoryService.recordType_groups)
 
     def verifyCredentials(self, credentials):
         return False
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090418/4cabcd0d/attachment.html>