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

[source_changes at macosforge.org]

Revision: 7984
          http://trac.macosforge.org/projects/calendarserver/changeset/7984
Author:   glyph at apple.com
Date:     2011-08-11 21:56:02 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
correct result ordering, hasSearchResults behavior

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:55:51 UTC (rev 7983)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py	2011-08-12 04:56:02 UTC (rev 7984)
@@ -86,8 +86,10 @@
         """
         if 'resourceSearch' not in request.args:
             returnValue('')
-        yield self.performSearch(request)
-        returnValue(tag)
+        if (yield self.performSearch(request)):
+            returnValue(tag)
+        else:
+            returnValue('')
 
 
     @renderer
@@ -119,7 +121,8 @@
             returnValue(self._searchResults)
         searchTerm = request.args.get('resourceSearch', [''])[0]
         if searchTerm:
-            results = yield self.resource.search(searchTerm)
+            results = sorted((yield self.resource.search(searchTerm)),
+                             key=lambda record: record.shortNames[0])
         else:
             results = []
         self._searchResults = results
@@ -204,7 +207,6 @@
         tag.fillSlots(resourceTitle=unicode(principalResource),
                       resourceId=resourceId,
                       davPropertyName=davPropertyName,
-                      # FIXME implement
                       proxySearch=proxySearch)
         try:
             namespace, name = davPropertyName.split("#")

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:55:51 UTC (rev 7983)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py	2011-08-12 04:56:02 UTC (rev 7984)
@@ -114,10 +114,10 @@
                 )
                 for (shortNames, fullName, authIds, emails, recordType)
                 in [
+                    (["bobd"], "Bob Dobson", ["bobdlogin"],
+                     ["bobd at example.com"], 'sudoers'),
                     (["bob"], "Bob Bobson", ["boblogin"],
                      ["bob at example.com", "bob at other.example.com"], 'users'),
-                    (["bobd"], "Bob Dobson", ["bobdlogin"],
-                     ["bobd at example.com"], 'sudoers'),
                    ]
             ])
 
@@ -225,6 +225,8 @@
             "No matches found for resource bob",
             gatherTextNodes(document)
         )
+        # Search results table should not be displayed.
+        self.assertIdentical(document.getElementById("tab_searchResults"), None)
 
 
     @inlineCallbacks
@@ -237,7 +239,7 @@
         [detailsTitle] = getElementsByTagName(document, 'h3')
         detailString = gatherTextNodes(detailsTitle)
         self.assertEquals(detailString,
-                          "Resource Details: Hello Fake Resource")
+                          "Resource Details: Hello Fake Resource: 'qux'")
         hiddenResourceId = document.getElementById(
             "hdn_resourceId").getAttribute("value")
         self.assertEquals(hiddenResourceId, "qux")
@@ -425,7 +427,7 @@
 
 
     def __str__(self):
-        return 'Hello Fake Resource'
+        return 'Hello Fake Resource: %r' % (self.resid,)
 
 
     def getChild(self, name):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/4deded06/attachment.html>