Merge a3312e8 into bf97828

CHANGES.rst

@@ -4,6 +4,9 @@ Changelog
 5.2 (unreleased)
 ----------------
 
+- Update `catalogView.dtml` to changed behavior of empty searches
+  (`#101 <https://github.com/zopefoundation/Products.ZCatalog/issues/101>`_).
+
 - Fix case where index value is changed to None after previously being indexed.
   (`#100 <https://github.com/zopefoundation/Products.ZCatalog/issues/100>`_)
 

src/Products/ZCatalog/dtml/catalogView.dtml

@@ -3,8 +3,8 @@
 
 <main class="container-fluid">
 
-    <dtml-let filterpath="REQUEST.get('filterpath', '/')"
-              results="searchResults(path=filterpath)">
+    <dtml-let filterpath="REQUEST.get('filterpath', '')"
+              results="searchResults(path=filterpath) if filterpath else list(getAllBrains())">
 <dtml-if results>
 
 <h1 class="form-label section-bar">Path filter</h1>

src/Products/ZCatalog/tests/test_zcatalog.py

@@ -19,6 +19,7 @@
 from Acquisition import Implicit
 import ExtensionClass
 from OFS.Folder import Folder as OFS_Folder
+from Testing.makerequest import makerequest
 
 
 class Folder(OFS_Folder):
@@ -307,6 +308,14 @@ def testSearchNot(self):
     # manage_setProgress
     # _getProgressThreshold
 
+    def test_catalogView(self):
+        catalog = makerequest(self._catalog)
+        # hack `getPhysicalPath` to avoid problem with the catalog plan
+        catalog.getPhysicalPath = None
+        vr = catalog.manage_catalogView()
+        self.assertTrue("There are no objects in the Catalog." not in vr,
+                        "catalogView wrongly reports `no objects`")
+
 
 class TestAddDelColumnIndex(ZCatalogBase, unittest.TestCase):