Merge branch 'master' into bbmaster2
This commit is contained in:
commit
354dfeda7f
3 changed files with 5 additions and 4 deletions
|
@ -65,8 +65,9 @@ class LayoutNodeView(Page, BaseView):
|
||||||
if self.target is not None:
|
if self.target is not None:
|
||||||
targetView = component.getMultiAdapter((self.target, self.request),
|
targetView = component.getMultiAdapter((self.target, self.request),
|
||||||
name='layout')
|
name='layout')
|
||||||
if targetView.title not in parts:
|
title = getattr(targetView, 'headTitle', targetView.title)
|
||||||
parts.append(targetView.title)
|
if title not in parts:
|
||||||
|
parts.append(title)
|
||||||
if self.globalOptions('reverseHeadTitle'):
|
if self.globalOptions('reverseHeadTitle'):
|
||||||
parts.reverse()
|
parts.reverse()
|
||||||
return ' - '.join(parts)
|
return ' - '.join(parts)
|
||||||
|
|
Loading…
Add table
Reference in a new issue