[CalendarServer-changes] [4064] CalendarServer/branches/users/sagen/resource-delegates-4038/ twistedcaldav/directory/principal.py

[source_changes at macosforge.org]

Revision: 4064
          http://trac.macosforge.org/projects/calendarserver/changeset/4064
Author:   sagen at apple.com
Date:     2009-04-23 07:04:20 -0700 (Thu, 23 Apr 2009)
Log Message:
-----------
Adding back the rendering of proxyFor and readOnlyProxyFor

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

Modified: CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/principal.py	2009-04-23 13:45:58 UTC (rev 4063)
+++ CalendarServer/branches/users/sagen/resource-delegates-4038/twistedcaldav/directory/principal.py	2009-04-23 14:04:20 UTC (rev 4064)
@@ -582,6 +582,9 @@
         members = (yield self.groupMembers())
         
         memberships = (yield self.groupMemberships())
+
+        proxyFor = (yield self.proxyFor(True))
+        readOnlyProxyFor = (yield self.proxyFor(False))
         
         returnValue("".join((
             """<div class="directory-listing">"""
@@ -607,6 +610,8 @@
             """\nAlternate URIs:\n"""          , format_list(format_link(u) for u in self.alternateURIs()),
             """\nGroup members:\n"""           , format_principals(members),
             """\nGroup memberships:\n"""       , format_principals(memberships),
+            """\nRead-write Proxy For:\n"""    , format_principals(proxyFor),
+            """\nRead-only Proxy For:\n"""     , format_principals(readOnlyProxyFor),
             """%s</pre></blockquote></div>"""  % extras,
             output
         )))
@@ -659,27 +664,21 @@
     @inlineCallbacks
     def proxyFor(self, read_write, resolve_memberships=True):
         proxyFors = set()
-        print "IN PROXYFOR", self, read_write
 
         if resolve_memberships:
             memberships = self._getRelatives("groups", infinity=True)
             for membership in memberships:
-                print "MEMBERSHIP:", membership
                 results = (yield membership.proxyFor(read_write, False))
-                print "RESULTS", results
                 proxyFors.update(results)
 
         if config.EnableProxyPrincipals:
             # Get proxy group UIDs and map to principal resources
             proxies = []
             memberships = (yield self._calendar_user_proxy_index().getMemberships(self.principalUID()))
-            print "FROM INDEX", memberships
             for uid in memberships:
                 subprincipal = self.parent.principalForUID(uid)
                 if subprincipal:
-                    print "SUBPRINCIPAL", subprincipal
                     if subprincipal.isProxyType(read_write):
-                        print "IS PROXY TYPE", read_write
                         proxies.append(subprincipal.parent)
                 else:
                     yield self._calendar_user_proxy_index().removeGroup(uid)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090423/237b1bb4/attachment.html>