From 3145f06fe029d36b049c2e94878c6cc9115d3831 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Mon, 24 May 2010 09:56:48 +0000
Subject: [PATCH] bug fix: show parents portlet only for concepts/resources
 rendered for a (non-text) node

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3878 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 browser/concept.py  | 6 ++++--
 browser/node.py     | 7 ++++++-
 browser/resource.py | 6 ++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/browser/concept.py b/browser/concept.py
index 91a1704..1c30391 100644
--- a/browser/concept.py
+++ b/browser/concept.py
@@ -198,8 +198,10 @@ class ConceptView(BaseView):
     def macro(self):
         return self.template.macros['conceptdata']
 
-    def __init__(self, context, request):
-        super(ConceptView, self).__init__(context, request)
+    #def __init__(self, context, request):
+    #    super(ConceptView, self).__init__(context, request)
+
+    def setupController(self):
         cont = self.controller
         if cont is None:
             return
diff --git a/browser/node.py b/browser/node.py
index 2c84267..cb43ed1 100644
--- a/browser/node.py
+++ b/browser/node.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2009 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2010 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -186,6 +186,7 @@ class NodeView(BaseView):
             basicView = component.getMultiAdapter((target, self.request), name=viewName)
             # xxx: obsolete when self.targetObject is virtual target:
             if hasattr(basicView, 'view'):
+                #basicView.setupController()
                 return basicView.view
         return self.page
 
@@ -239,6 +240,8 @@ class NodeView(BaseView):
         if obj is not None:
             basicView = component.getMultiAdapter((obj, self.request))
             basicView._viewName = self.context.viewName
+            if self.context.nodeType != 'text':
+                basicView.setupController()
             return basicView.view
 
     @Lazy
@@ -400,6 +403,8 @@ class NodeView(BaseView):
             basicView = component.getMultiAdapter((obj, self.request))
             if obj == self.targetObject:
                 basicView._viewName = self.context.viewName
+            #if self.context.nodeType != 'text':
+            basicView.setupController()
             if hasattr(basicView, 'view'):
                 return basicView.view
 
diff --git a/browser/resource.py b/browser/resource.py
index 896030a..0a81c53 100644
--- a/browser/resource.py
+++ b/browser/resource.py
@@ -135,8 +135,10 @@ class ResourceView(BaseView):
         else:
             return self.template.macros['download']
 
-    def __init__(self, context, request):
-        super(ResourceView, self).__init__(context, request)
+    #def __init__(self, context, request):
+    #    super(ResourceView, self).__init__(context, request)
+
+    def setupController(self):
         cont = self.controller
         if cont is None:
             return