From 5bf0b20494e8c51d876a7be88eb696f8612cd911 Mon Sep 17 00:00:00 2001 From: helmutm Date: Mon, 10 Aug 2009 10:29:36 +0000 Subject: [PATCH] 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 --- layout/base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/layout/base.py b/layout/base.py index 2834f8e..df17c1e 100644 --- a/layout/base.py +++ b/layout/base.py @@ -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,