From 8855a38499694d689cd6c9e28750c80eaa46f4c8 Mon Sep 17 00:00:00 2001 From: helmutm Date: Tue, 25 Nov 2008 11:15:44 +0000 Subject: [PATCH] dereference adapter if necessary git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3007 fd906abe-77d9-0310-91a1-e0d9ade77398 --- browser/node.py | 4 +++- layout/browser/concept.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/node.py b/browser/node.py index 43f6c92..492f644 100644 --- a/browser/node.py +++ b/browser/node.py @@ -51,7 +51,7 @@ from cybertools.stateful.interfaces import IStateful from cybertools.typology.interfaces import IType, ITypeManager from cybertools.xedit.browser import ExternalEditorView from loops.browser.action import DialogAction -from loops.common import adapted +from loops.common import adapted, AdapterBase from loops.i18n.browser import i18n_macros from loops.interfaces import IConcept, IResource, IDocument, IMediaAsset, INode from loops.interfaces import IViewConfiguratorSchema @@ -327,6 +327,8 @@ class NodeView(BaseView): print '***', name, params target = self.virtualTargetObject if target is not None: + if isinstance(target, AdapterBase): + target = target.context targetView = component.queryMultiAdapter( (adapted(target), self.request), name=name) if targetView is None: diff --git a/layout/browser/concept.py b/layout/browser/concept.py index c517372..b41fb03 100644 --- a/layout/browser/concept.py +++ b/layout/browser/concept.py @@ -45,6 +45,10 @@ class ConceptView(object): def title(self): return self.context.title + @Lazy + def description(self): + return self.context.description + @Lazy def url(self): return '%s/.%s-%s' % (absoluteURL(self.node, self.request), self.context.uid, normalize(self.context.title))