check 'default' layout root in addition to current root

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3499 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2009-08-10 10:29:36 +00:00
parent ca354a72cc
commit 5bf0b20494

View file

@ -109,14 +109,15 @@ class TargetLayoutInstance(NodeLayoutInstance):
obj = self.target.context
tp = obj.getType()
found = False
topLevelLayout = self.context.getMenu()
currentRoot = self.context.getMenu()
for n in obj.getClients() + tp.getClients():
if not ILayoutNode.providedBy(n):
continue
if n.nodeType == 'info' and n.viewName in names:
if pageName != (n.pageName or '').strip():
continue
if n.getMenu() != topLevelLayout:
layoutRoot = n.getMenu()
if getName(layoutRoot) != 'default' and layoutRoot != currentRoot:
continue
layout = region.layouts[n.viewName]
li = component.getAdapter(n, ILayoutInstance,