[Testbot] Plone 5.0 - Python 2.7 - Build # 2877 - Fixed! - 0 failure(s)
jenkins at plone.org
jenkins at plone.org
Sat Jul 26 14:37:24 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 2877 - Fixed!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/2877/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.layout
Branch: refs/heads/master
Date: 2014-07-26T15:33:34+02:00
Author: Timo Stollenwerk (tisto) <tisto at plone.org>
Commit: https://github.com/plone/plone.app.layout/commit/6a5ec16543f04f2273a480bb4a9a83bf5c590b31
Make sure we return the site title from the registry on the portal root.
Files changed:
M plone/app/layout/viewlets/common.py
diff --git a/plone/app/layout/viewlets/common.py b/plone/app/layout/viewlets/common.py
index 7d55f29..0aeec85 100644
--- a/plone/app/layout/viewlets/common.py
+++ b/plone/app/layout/viewlets/common.py
@@ -66,6 +66,13 @@ class TitleViewlet(ViewletBase):
@property
@memoize
+ def site_title_setting(self):
+ registry = getUtility(IRegistry)
+ site_settings = registry.forInterface(ISiteSchema, prefix="plone")
+ return site_settings.site_title
+
+ @property
+ @memoize
def page_title(self):
'''
Get the page title. If we are in the portal_factory we want use the
@@ -90,15 +97,16 @@ def page_title(self):
# If we are on portal root, look up the portal title from registry
if IPloneSiteRoot.providedBy(self.context):
- registry = getUtility(IRegistry)
- site_settings = registry.forInterface(ISiteSchema, prefix="plone")
- return site_settings.site_title
+ return self.site_title_setting
context_state = getMultiAdapter((self.context, self.request),
name=u'plone_context_state')
return escape(safe_unicode(context_state.object_title()))
def update(self):
+ if IPloneSiteRoot.providedBy(self.context):
+ self.site_title = self.site_title_setting
+ return
portal_state = getMultiAdapter((self.context, self.request),
name=u'plone_portal_state')
portal_title = escape(safe_unicode(portal_state
-------------------------------------------------------------------------------
More information about the Testbot
mailing list