# HG changeset patch # User Thierry Florac # Date 1531863845 -7200 # Node ID 6fca8ce6a700de7e222bf6aee77af5bd6253af85 # Parent d3ef1b0cc0765beed5a864ffed688593d29c5d5e Handle settings inheritance diff -r d3ef1b0cc076 -r 6fca8ce6a700 src/pyams_default_theme/viewlet/banner/__init__.py --- a/src/pyams_default_theme/viewlet/banner/__init__.py Tue Jul 17 23:43:40 2018 +0200 +++ b/src/pyams_default_theme/viewlet/banner/__init__.py Tue Jul 17 23:44:05 2018 +0200 @@ -35,4 +35,7 @@ @property def settings(self): target = get_parent(self.context, IHeaderTarget) - return ISimpleHeaderRendererSettings(IHeaderSettings(target).settings, None) + settings = IHeaderSettings(target) + while settings.inherit: + settings = IHeaderSettings(settings.parent) + return ISimpleHeaderRendererSettings(settings.settings, None) diff -r d3ef1b0cc076 -r 6fca8ce6a700 src/pyams_default_theme/viewlet/logo/__init__.py --- a/src/pyams_default_theme/viewlet/logo/__init__.py Tue Jul 17 23:43:40 2018 +0200 +++ b/src/pyams_default_theme/viewlet/logo/__init__.py Tue Jul 17 23:44:05 2018 +0200 @@ -12,6 +12,7 @@ __docformat__ = 'restructuredtext' + # import standard library # import interfaces @@ -34,4 +35,7 @@ @property def settings(self): target = get_parent(self.context, IHeaderTarget) - return ISimpleHeaderRendererSettings(IHeaderSettings(target).settings, None) + settings = IHeaderSettings(target) + while settings.inherit: + settings = IHeaderSettings(settings.parent) + return ISimpleHeaderRendererSettings(settings.settings, None)