[CalendarServer-changes] [7981] CalendarServer/branches/users/glyph/imip-and-admin-html/ calendarserver/webadmin/resource.py

[source_changes at macosforge.org]

Revision: 7981
          http://trac.macosforge.org/projects/calendarserver/changeset/7981
Author:   glyph at apple.com
Date:     2011-08-11 21:55:28 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
pass request to proxyMatrix

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:55:17 UTC (rev 7980)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:55:28 UTC (rev 7981)
@@ -293,7 +293,7 @@
     _matrix = None
 
     @inlineCallbacks
-    def proxyMatrix(self):
+    def proxyMatrix(self, request):
         """
         Compute a matrix of proxies to display in a 2-column table.
 
@@ -324,7 +324,8 @@
                 readProxies = []
                 writeProxies = []
                 def getres(ref):
-                    return self.adminResource.getResourceById(str(proxyHRef))
+                    return self.adminResource.getResourceById(request,
+                                                              str(proxyHRef))
                 for proxyHRef in readMembers.children:
                     readProxies.append((yield getres(proxyHRef)))
                 for proxyHRef in writeMembers.children:
@@ -348,7 +349,7 @@
         """
         Renderer which shows its tag if there are no proxies for this resource.
         """
-        mtx = yield self.proxyMatrix()
+        mtx = yield self.proxyMatrix(request)
         if mtx:
             returnValue("")
         returnValue(tag)
@@ -360,7 +361,7 @@
         """
         Renderer which shows its tag if there are any proxies for this resource.
         """
-        mtx = yield self.proxyMatrix()
+        mtx = yield self.proxyMatrix(request)
         if mtx:
             returnValue(tag)
         returnValue("")
@@ -404,7 +405,7 @@
         rows of existing proxies for the currently-viewed resource.
         """
         result = []
-        mtx = yield self.proxyMatrix()
+        mtx = yield self.proxyMatrix(request)
         for idx, (readProxy, writeProxy) in enumerate(mtx):
             result.append(ProxyRow(tag.clone(), idx, readProxy, writeProxy))
         returnValue(result)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/1df89ea6/attachment.html>