From 6d0a589015914906a0ac140547628fa819f05c46 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Tue, 27 Dec 2011 12:02:27 +0100
Subject: [PATCH] link to image page from image grid; hide concepts from
 'related' portlet if marked as hidden

---
 browser/lobo/standard.pt   |  2 +-
 browser/resource.py        | 33 +++++++++++++++++++++++++++++----
 browser/resource_macros.pt |  2 +-
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/browser/lobo/standard.pt b/browser/lobo/standard.pt
index d086bb2..b737492 100644
--- a/browser/lobo/standard.pt
+++ b/browser/lobo/standard.pt
@@ -83,7 +83,7 @@
                          style cell/style">
         <metal:image use-macro="item/macros/image" />
         <div class="legend">
-          <b tal:content="cell/title" />
+          <a tal:attributes="href cell/targetUrl"><b tal:content="cell/title" /></a>
           <span tal:condition="cell/img/showInfo|nothing">
             <a tal:define="url string:${cell/img/url}/meta_info.html"
                tal:attributes="href url;
diff --git a/browser/resource.py b/browser/resource.py
index 1a41178..7d41259 100644
--- a/browser/resource.py
+++ b/browser/resource.py
@@ -38,6 +38,7 @@ from zope.traversing.api import getName, getParent
 from zope.traversing.browser import absoluteURL
 
 from cybertools.browser.action import actions
+from cybertools.meta.interfaces import IOptions
 from cybertools.typology.interfaces import IType
 from cybertools.xedit.browser import ExternalEditorView, fromUnicode
 from loops.browser.action import DialogAction, TargetAction
@@ -51,6 +52,7 @@ from loops.interfaces import IMediaAsset as legacy_IMediaAsset
 from loops.interfaces import ITypeConcept
 from loops.media.interfaces import IMediaAsset
 from loops.organize.stateful.browser import statefulActions
+from loops.organize.util import getRolesForPrincipal
 from loops.versioning.browser import version_macros
 from loops.versioning.interfaces import IVersionable
 from loops import util
@@ -270,15 +272,38 @@ class ResourceView(BaseView):
 
     # relations
 
-    def concepts(self):
-        for r in self.context.getConceptRelations():
-            yield ConceptRelationView(r, self.request)
+    def isHidden(self, pr):
+        hideRoles = None
+        options = component.queryAdapter(adapted(pr.first), IOptions)
+        if options is not None:
+            hideRoles = options('hide_for', None)
+        if not hideRoles:
+            hideRoles = IOptions(adapted(pr.first.conceptType))('hide_for', None)
+        if hideRoles is not None:
+            principal = self.request.principal
+            if (IUnauthenticatedPrincipal.providedBy(principal) and
+                'zope.Anonymous' in hideRoles):
+                return True
+            roles = getRolesForPrincipal(principal.id, self.context)
+            for r in roles:
+                if r in hideRoles:
+                    return True
+        return False
+
+    #@Lazy
+    def conceptsForPortlet(self):
+        return [p for p in self.relatedConcepts() if not self.isHidden(p.relation)]
 
     def relatedConcepts(self):
         for c in self.concepts():
-            if c.isProtected: continue
+            if c.isProtected:
+                continue
             yield c
 
+    def concepts(self):
+        for r in self.context.getConceptRelations():
+            yield ConceptRelationView(r, self.request)
+
     def clients(self):
         for node in self.context.getClients():
             yield NodeView(node, self.request)
diff --git a/browser/resource_macros.pt b/browser/resource_macros.pt
index 0e31160..609f549 100644
--- a/browser/resource_macros.pt
+++ b/browser/resource_macros.pt
@@ -114,7 +114,7 @@
 
 
 <metal:actions define-macro="related">
-          <div tal:repeat="concept macro/info/relatedConcepts">
+          <div tal:repeat="concept macro/info/conceptsForPortlet">
             <a tal:attributes="href python: view.getUrlForTarget(concept);
                                title concept/relationInfo">
               <span i18n:translate="" tal:content="concept/title">Concept</span>