[CalendarServer-changes] [1807] CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav /directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 1807
          http://trac.macosforge.org/projects/calendarserver/changeset/1807
Author:   wsanchez at apple.com
Date:     2007-08-20 16:07:17 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
Pulled up r1798 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py	2007-08-20 23:06:34 UTC (rev 1806)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/appleopendirectory.py	2007-08-20 23:07:17 UTC (rev 1807)
@@ -414,6 +414,7 @@
         elif recordType == DirectoryService.recordType_groups:
             listRecordType = dsattributes.kDSStdRecordTypeGroups
             attrs.append(dsattributes.kDSNAttrGroupMembers)
+            attrs.append(dsattributes.kDSNAttrNestedGroups)
 
         elif recordType == DirectoryService.recordType_locations:
             listRecordType = dsattributes.kDSStdRecordTypePlaces
@@ -499,6 +500,11 @@
                     memberGUIDs = ()
                 elif type(memberGUIDs) is str:
                     memberGUIDs = (memberGUIDs,)
+                nestedGUIDs = value.get(dsattributes.kDSNAttrNestedGroups)
+                if nestedGUIDs:
+                    if type(nestedGUIDs) is str:
+                        nestedGUIDs = (nestedGUIDs,)
+                    memberGUIDs += tuple(nestedGUIDs)
             else:
                 memberGUIDs = ()
 

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