[CalendarServer-changes] [993] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource. patch

[source_changes at macosforge.org]

Revision: 993
          http://trac.macosforge.org/projects/calendarserver/changeset/993
Author:   wsanchez at apple.com
Date:     2007-01-08 20:05:12 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
groupMembers() and groupMemberships() should return principals, not principal URLs.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch	2007-01-09 03:44:53 UTC (rev 992)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch	2007-01-09 04:05:12 UTC (rev 993)
@@ -868,6 +868,19 @@
      def readProperty(self, property, request):
          def defer():
              if type(property) is tuple:
+@@ -1604,10 +1956,10 @@
+                     return davxml.PrincipalURL(davxml.HRef(self.principalURL()))
+ 
+                 if name == "group-member-set":
+-                    return davxml.GroupMemberSet(*[davxml.HRef(p) for p in self.groupMembers()])
++                    return davxml.GroupMemberSet(*[davxml.HRef(p.principalURL()) for p in self.groupMembers()])
+ 
+                 if name == "group-membership":
+-                    return davxml.GroupMembership(*[davxml.HRef(g) for g in self.groupMemberships()])
++                    return davxml.GroupMembership(*[davxml.HRef(g.principalURL()) for g in self.groupMemberships()])
+ 
+                 if name == "resourcetype":
+                     if self.isCollection():
 @@ -1673,6 +2025,24 @@
          else:
              return uri in self.groupMembers()

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