Merge pull request #148 from syslabcom/scrum-1939-faceted-navigation

Make results-listing available to facetednavigation

Author: thet

setup.py

@@ -46,6 +46,7 @@
     python_requires=">=3.8",
     install_requires=[
         "setuptools",
+        "eea.facetednavigation",
         "ftw.upgrade",
         "plone.api",
         "collective.vdexvocabulary",

src/recensio/plone/browser/configure.zcml

@@ -1,13 +1,18 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:faceted="http://namespaces.zope.org/faceted"
     xmlns:plone="http://namespaces.plone.org/plone"
     >
 
   <include
       package="z3c.jbot"
       file="meta.zcml"
       />
+  <include
+      package="eea.facetednavigation"
+      file="meta.zcml"
+      />
   <browser:jbot
       directory="overrides"
       layer="recensio.plone.interfaces.IRecensioPloneLayer"
@@ -82,6 +87,17 @@
 
   <!-- Listing views -->
 
+  <configure package="eea.facetednavigation.browser">
+    <browser:page
+        name="faceted_query"
+        for="..interfaces.IFacetedNavigable"
+        class="recensio.plone.browser.listing.RecensioFacetedQueryHandler"
+        template="template/query.pt"
+        permission="zope2.View"
+        layer="recensio.plone.interfaces.IRecensioPloneLayer"
+        />
+  </configure>
+
   <browser:page
       name="sorting-menu"
       for="*"
@@ -90,8 +106,9 @@
       permission="zope2.View"
       />
 
-  <browser:page
+  <faceted:view
       name="results-listing"
+      title="Review Results Listing"
       for="*"
       class=".listing.ResultsListing"
       template="templates/results-listing.pt"

src/recensio/plone/browser/listing.py

@@ -1,4 +1,6 @@
+from eea.facetednavigation.browser.app.query import FacetedQueryHandler
 from plone import api
+from plone.app.contentlisting.interfaces import IContentListing
 from Products.CMFPlone.browser.navtree import getNavigationRoot
 from Products.CMFPlone.utils import normalizeString
 from Products.Five.browser import BrowserView
@@ -9,6 +11,13 @@
 from ZTUtils import make_query
 
 
+class RecensioFacetedQueryHandler(FacetedQueryHandler):
+    """Add recensio capabilities"""
+
+    def punctuated_title_and_subtitle(self, obj):
+        return punctuated_title_and_subtitle(obj)
+
+
 class ResultsListing(BrowserView):
     """Lists search results."""
 
@@ -36,6 +45,7 @@ def items(self):
         catalog = api.portal.get_tool("portal_catalog")
         results = catalog(self.query)
         IAnnotations(self.request)["recensio.query_results"] = results
+        results = IContentListing(results)
         return results
 
     def translate(self, msgid):

src/recensio/plone/browser/templates/latest-items.pt

@@ -40,7 +40,7 @@
            tal:condition="context/syndication-util/context_allowed"
         ></p>
 
-        <div metal:use-macro="context/results-listing/macros/results-listing"
+        <div metal:use-macro="context/results-listing/macros/content-core"
              tal:condition="results"
         ></div>