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

[source_changes at macosforge.org]

Revision: 7961
          http://trac.macosforge.org/projects/calendarserver/changeset/7961
Author:   glyph at apple.com
Date:     2011-08-11 21:51:34 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
make proxy search test pass

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:51:21 UTC (rev 7960)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:51:34 UTC (rev 7961)
@@ -36,13 +36,12 @@
 from twistedcaldav.config import config
 from twistedcaldav.extensions import DAVFile, ReadOnlyResourceMixIn
 
-from twisted.internet.defer import inlineCallbacks, returnValue
+from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 from twext.web2.http import Response
 from twisted.python.modules import getModule
 from twext.web2.http_headers import MimeType
 from zope.interface.declarations import implements
 from twext.web2.stream import MemoryStream
-from twisted.internet.defer import succeed
 from twext.web2.dav import davxml
 
 from twisted.web.iweb import ITemplateLoader
@@ -139,11 +138,12 @@
         """
         resourceId = request.args.get('resourceId', [''])[0]
         propertyName = request.args.get('davPropertyName', [''])[0]
+        proxySearch = request.args.get('proxySearch', [''])[0]
         if resourceId:
             principalResource = self.resource.getResourceById(
                 request, resourceId)
             return DetailsElement(
-                resourceId, principalResource, propertyName, tag,
+                resourceId, principalResource, propertyName, proxySearch, tag,
                 self.resource
             )
         else:
@@ -191,15 +191,16 @@
 
 class DetailsElement(Element):
 
-    def __init__(self, resourceId, principalResource, davPropertyName, tag,
-                 adminResource):
+    def __init__(self, resourceId, principalResource, davPropertyName,
+                 proxySearch, tag, adminResource):
         self.principalResource = principalResource
         self.adminResource = adminResource
+        self.proxySearch = proxySearch
         tag.fillSlots(resourceTitle=unicode(principalResource),
                       resourceId=resourceId,
                       davPropertyName=davPropertyName,
                       # FIXME implement
-                      proxySearch="")
+                      proxySearch=proxySearch)
         try:
             namespace, name = davPropertyName.split("#")
         except Exception:
@@ -308,7 +309,10 @@
 
 
     def performProxySearch(self, request):
-        return succeed([])
+        if self.proxySearch:
+            return self.adminResource.search(self.proxySearch)
+        else:
+            return succeed([])
 
 
     @renderer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/2ce7406d/attachment.html>