# HG changeset patch # User Thierry Florac # Date 1611760585 -3600 # Node ID fed1815bb9205baf993b2f4e669ef0e85fdaee81 # Parent 75d913d682d4db03c62dd8b5192902b593743144 Version 0.1.56 diff -r 75d913d682d4 -r fed1815bb920 buildout.cfg --- a/buildout.cfg Wed Jan 27 15:52:09 2021 +0100 +++ b/buildout.cfg Wed Jan 27 16:16:25 2021 +0100 @@ -80,4 +80,4 @@ eggs = pyams_default_theme [test] [versions] -pyams_default_theme = 0.1.55 +pyams_default_theme = 0.1.56 diff -r 75d913d682d4 -r fed1815bb920 docs/HISTORY.txt --- a/docs/HISTORY.txt Wed Jan 27 15:52:09 2021 +0100 +++ b/docs/HISTORY.txt Wed Jan 27 16:16:25 2021 +0100 @@ -1,6 +1,13 @@ History ======= +0.1.56 +------ + - updated search results templates to handle cases where components are not applied on + search folders + - updated map paragraph default renderer + - handle logos in view items results + 0.1.55 ------ - added aggregations support to search results portlets diff -r 75d913d682d4 -r fed1815bb920 setup.py --- a/setup.py Wed Jan 27 15:52:09 2021 +0100 +++ b/setup.py Wed Jan 27 16:16:25 2021 +0100 @@ -22,7 +22,7 @@ README = os.path.join(DOCS, 'README.txt') HISTORY = os.path.join(DOCS, 'HISTORY.txt') -version = '0.1.55' +version = '0.1.56' long_description = open(README).read() + '\n\n' + open(HISTORY).read() tests_require = [] diff -r 75d913d682d4 -r fed1815bb920 src/pyams_default_theme.egg-info/PKG-INFO --- a/src/pyams_default_theme.egg-info/PKG-INFO Wed Jan 27 15:52:09 2021 +0100 +++ b/src/pyams_default_theme.egg-info/PKG-INFO Wed Jan 27 16:16:25 2021 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyams-default-theme -Version: 0.1.55 +Version: 0.1.56 Summary: PyAMS default theme Home-page: http://hg.ztfy.org/pyams/pyams_default_theme Author: Thierry Florac @@ -11,6 +11,13 @@ History ======= + 0.1.56 + ------ + - updated search results templates to handle cases where components are not applied on + search folders + - updated map paragraph default renderer + - handle logos in view items results + 0.1.55 ------ - added aggregations support to search results portlets diff -r 75d913d682d4 -r fed1815bb920 src/pyams_default_theme/shared/view/portlet/__init__.py --- a/src/pyams_default_theme/shared/view/portlet/__init__.py Wed Jan 27 15:52:09 2021 +0100 +++ b/src/pyams_default_theme/shared/view/portlet/__init__.py Wed Jan 27 16:16:25 2021 +0100 @@ -15,6 +15,7 @@ from zope.interface import Interface from zope.schema.fieldproperty import FieldProperty +from pyams_content.shared.logo import IWfLogo from pyams_content.shared.view.portlet.interfaces import IViewItemsPortletSettings from pyams_default_theme.features.search.portlet import HIDDEN_HEADER_DISPLAY, START_HEADER_DISPLAY from pyams_default_theme.shared.view.portlet.interfaces import \ @@ -40,10 +41,13 @@ """Base view items portlet renderer""" def get_url(self, target): + if IWfLogo.providedBy(target): + if target.target is None: + return target.url + target = target.target if self.settings.force_canonical_url: return canonical_url(target, self.request) - else: - return relative_url(target, self.request) + return relative_url(target, self.request) def render(self): result = super(BaseViewItemsPortletRenderer, self).render()