[CalendarServer-changes] [7979] CalendarServer/branches/users/glyph/imip-and-admin-html/ calendarserver/webadmin

[source_changes at macosforge.org]

Revision: 7979
          http://trac.macosforge.org/projects/calendarserver/changeset/7979
Author:   glyph at apple.com
Date:     2011-08-11 21:55:07 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
remove 'no matches found' message

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_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:54:56 UTC (rev 7978)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:55:07 UTC (rev 7979)
@@ -373,6 +373,8 @@
         Renderer which shows its tag if there are no proxy search results for
         this request.
         """
+        if not self.proxySearch:
+            returnValue("")
         results = yield self.performProxySearch()
         if results:
             returnValue("")

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py	2011-08-12 04:54:56 UTC (rev 7978)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py	2011-08-12 04:55:07 UTC (rev 7979)
@@ -256,6 +256,9 @@
         # I'm not attempting to retrieve a property, there's nothing to fail to
         # parse.
         self.assertNotIn("Unable to parse property", gatherTextNodes(document))
+        # I'm not searching for proxies, so there shouldn't be any results.
+        self.assertNotIn("No matches found for proxy resource",
+                         gatherTextNodes(document))
 
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/9773f96e/attachment-0001.html>