# HG changeset patch # User Thierry Florac # Date 1553615456 -3600 # Node ID 532d2f58861bc02a55aae67d9733eaffd768ddcd # Parent c72e9d8bfcda828e89a7a04a6e960ec2c4455405 Updated search results rendering for resources diff -r c72e9d8bfcda -r 532d2f58861b src/pyams_default_theme/shared/resource/__init__.py --- a/src/pyams_default_theme/shared/resource/__init__.py Tue Mar 26 16:49:32 2019 +0100 +++ b/src/pyams_default_theme/shared/resource/__init__.py Tue Mar 26 16:50:56 2019 +0100 @@ -15,9 +15,9 @@ from zope.interface import Interface from pyams_content.shared.resource import IAgeRange, IResourceInfo, IWfResource -from pyams_default_theme import _ from pyams_default_theme import lightbox -from pyams_default_theme.features.search.portlet import ISearchResultRenderer, WfSharedContentSearchResultRenderer +from pyams_default_theme.features.search.portlet import ISearchResultHeader, ISearchResultRenderer, \ + WfSharedContentSearchResultRenderer from pyams_default_theme.interfaces import ISearchResultsView from pyams_default_theme.shared.common.interfaces import ICustomContentSpecificitiesParagraphRenderer, \ ICustomContentSpecificitiesRenderer @@ -28,6 +28,8 @@ from pyams_utils.text import text_to_html from pyams_viewlet.viewlet import ViewContentProvider +from pyams_default_theme import _ + @adapter_config(context=(IWfResource, IPyAMSUserLayer, Interface), provides=ICustomContentSpecificitiesRenderer) @@ -54,14 +56,17 @@ return translate(result).format(value) +@adapter_config(context=(IWfResource, IPyAMSUserLayer, ISearchResultsView), provides=ISearchResultHeader) +def resource_search_result_header_adapter(context, request, view): + """Resource search result header adapter""" + header = II18n(context).query_attribute('header', request=request) + if header: + return text_to_html(header) + else: + return '' + + @adapter_config(context=(IWfResource, IPyAMSUserLayer, ISearchResultsView), provides=ISearchResultRenderer) @template_config(template='templates/search-result.pt', layer=IPyAMSUserLayer) class WfResourceSearchResultRenderer(WfSharedContentSearchResultRenderer): """Resource search result renderer""" - - @property - def header(self): - header = II18n(self.context).query_attribute('header', request=self.request) - if header: - return text_to_html(header) - return '' diff -r c72e9d8bfcda -r 532d2f58861b src/pyams_default_theme/shared/resource/templates/search-result.pt --- a/src/pyams_default_theme/shared/resource/templates/search-result.pt Tue Mar 26 16:49:32 2019 +0100 +++ b/src/pyams_default_theme/shared/resource/templates/search-result.pt Tue Mar 26 16:50:56 2019 +0100 @@ -1,4 +1,4 @@ -