From 5d5507934954b76bbaac7d589a449df7b29665a3 Mon Sep 17 00:00:00 2001 From: helmutm Date: Wed, 14 Oct 2009 13:07:24 +0000 Subject: [PATCH] show parents/related concepts portlet for anonymous if site option 'showParentsForAnonymous' is set git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3588 fd906abe-77d9-0310-91a1-e0d9ade77398 --- browser/concept.py | 10 ++++++---- browser/resource.py | 30 ++++++++++++++++-------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/browser/concept.py b/browser/concept.py index 5b98c5e..a07d0ab 100644 --- a/browser/concept.py +++ b/browser/concept.py @@ -194,11 +194,13 @@ class ConceptView(BaseView): def __init__(self, context, request): super(ConceptView, self).__init__(context, request) cont = self.controller - if (cont is not None and not IUnauthenticatedPrincipal.providedBy( - self.request.principal)): + if cont is None: + return + if (self.globalOptions('showParentsForUnauthorized') or + not IUnauthenticatedPrincipal.providedBy(self.request.principal)): cont.macros.register('portlet_right', 'parents', title=_(u'Parents'), - subMacro=concept_macros.macros['parents'], - priority=20, info=self) + subMacro=concept_macros.macros['parents'], + priority=20, info=self) @Lazy def adapted(self): diff --git a/browser/resource.py b/browser/resource.py index 2c8e291..3e59946 100644 --- a/browser/resource.py +++ b/browser/resource.py @@ -137,20 +137,22 @@ class ResourceView(BaseView): def __init__(self, context, request): super(ResourceView, self).__init__(context, request) - if not IUnauthenticatedPrincipal.providedBy(self.request.principal): - cont = self.controller - if cont is not None: - if list(self.relatedConcepts()): - cont.macros.register('portlet_right', 'related', - title=_(u'Related Items'), - subMacro=self.template.macros['related'], - priority=20, info=self) - versionable = IVersionable(self.context, None) - if versionable is not None and len(versionable.versions) > 1: - cont.macros.register('portlet_right', 'versions', - title='Version ' + versionable.versionId, - subMacro=version_macros.macros['portlet_versions'], - priority=25, info=self) + cont = self.controller + if cont is None: + return + if (self.globalOptions('showParentsForUnauthorized') or + not IUnauthenticatedPrincipal.providedBy(self.request.principal)): + if list(self.relatedConcepts()): + cont.macros.register('portlet_right', 'related', + title=_(u'Related Items'), + subMacro=self.template.macros['related'], + priority=20, info=self) + versionable = IVersionable(self.context, None) + if versionable is not None and len(versionable.versions) > 1: + cont.macros.register('portlet_right', 'versions', + title='Version ' + versionable.versionId, + subMacro=version_macros.macros['portlet_versions'], + priority=25, info=self) @Lazy def view(self):