[CalendarServer-changes] [3435] CalendarServer/branches/users/sagen/expandedgroupmemberset-3421/ twistedcaldav

source_changes at macosforge.org source_changes at macosforge.org
Tue Dec 2 09:21:21 PST 2008


Revision: 3435
          http://trac.macosforge.org/projects/calendarserver/changeset/3435
Author:   sagen at apple.com
Date:     2008-12-02 09:21:21 -0800 (Tue, 02 Dec 2008)
Log Message:
-----------
Move the expanded-group-member-set code into resource.py to avoid messing up liveProperties

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/expandedgroupmemberset-3421/twistedcaldav/directory/principal.py
    CalendarServer/branches/users/sagen/expandedgroupmemberset-3421/twistedcaldav/resource.py

Modified: CalendarServer/branches/users/sagen/expandedgroupmemberset-3421/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/sagen/expandedgroupmemberset-3421/twistedcaldav/directory/principal.py	2008-12-02 15:59:02 UTC (rev 3434)
+++ CalendarServer/branches/users/sagen/expandedgroupmemberset-3421/twistedcaldav/directory/principal.py	2008-12-02 17:21:21 UTC (rev 3435)
@@ -525,31 +525,7 @@
         else:
             return self.record.shortName
 
-    liveProperties = CalendarPrincipalResource.liveProperties + (
-        (customxml.calendarserver_namespace, "expanded-group-member-set"),
-    )
 
-    @inlineCallbacks
-    def readProperty(self, property, request):
-        if type(property) is tuple:
-            qname = property
-        else:
-            qname = property.qname()
-
-        namespace, name = qname
-
-        if namespace == customxml.calendarserver_namespace:
-            if name == "expanded-group-member-set":
-                principals = (yield self.expandedGroupMembers())
-                returnValue(
-                    customxml.ExpandedGroupMemberSet(
-                        *[davxml.HRef(p.principalURL()) for p in principals]
-                    )
-                )
-
-        result = (yield super(DirectoryPrincipalResource, self).readProperty(property, request))
-        returnValue(result)
-
     ##
     # ACL
     ##

Modified: CalendarServer/branches/users/sagen/expandedgroupmemberset-3421/twistedcaldav/resource.py
===================================================================
--- CalendarServer/branches/users/sagen/expandedgroupmemberset-3421/twistedcaldav/resource.py	2008-12-02 15:59:02 UTC (rev 3434)
+++ CalendarServer/branches/users/sagen/expandedgroupmemberset-3421/twistedcaldav/resource.py	2008-12-02 17:21:21 UTC (rev 3435)
@@ -700,6 +700,7 @@
         (calendarserver_namespace, "email-address-set"),
         (calendarserver_namespace, "calendar-proxy-read-for"  ),
         (calendarserver_namespace, "calendar-proxy-write-for" ),
+        (calendarserver_namespace, "expanded-group-member-set"),
     )
 
     @classmethod
@@ -789,12 +790,22 @@
                     *[davxml.HRef(principal.principalURL()) for principal in results]
                 ))
 
+            elif name == "expanded-group-member-set":
+                principals = (yield self.expandedGroupMembers())
+                returnValue(customxml.ExpandedGroupMemberSet(
+                    *[davxml.HRef(p.principalURL()) for p in principals]
+                ))
+
+
         result = (yield super(CalendarPrincipalResource, self).readProperty(property, request))
         returnValue(result)
 
     def groupMembers(self):
         return succeed(())
 
+    def expandedGroupMembers(self):
+        return succeed(())
+
     def groupMemberships(self):
         return succeed(())
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081202/f8f3c57d/attachment.html>


More information about the calendarserver-changes mailing list