cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

supply more methods with 'noSecurityCheck' setting for more flexible listing of parents

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3394 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2009-05-22 09:36:12 +00:00
parent 61999058e2
commit 39533692d9
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common.py
View file

@ -311,7 +311,7 @@ class RelationSet(object):
langInfo = None langInfo = None
def __init__(self, context, predicateName, interface=None): def __init__(self, context, predicateName, interface=None, noSecurityCheck=False):
self.adapted = context self.adapted = context
if isinstance(context, AdapterBase): if isinstance(context, AdapterBase):
self.context = context.context self.context = context.context
@ -319,6 +319,7 @@ class RelationSet(object):
self.context = context self.context = context
self.predicateName = predicateName self.predicateName = predicateName
self.interface = interface self.interface = interface
self.noSecurityCheck = noSecurityCheck
@Lazy @Lazy
def loopsRoot(self): def loopsRoot(self):
@ -338,7 +339,8 @@ class ParentRelationSet(RelationSet):
def add(self, related, order=0, relevance=1.0): def add(self, related, order=0, relevance=1.0):
if isinstance(related, AdapterBase): if isinstance(related, AdapterBase):
related = related.context related = related.context
self.context.deassignParent(related, [self.predicate]) # avoid duplicates self.context.deassignParent(related, [self.predicate], # avoid duplicates
noSecurityCheck=self.noSecurityCheck)
self.context.assignParent(related, self.predicate, order, relevance) self.context.assignParent(related, self.predicate, order, relevance)
def remove(self, related): def remove(self, related):
@ -349,20 +351,24 @@ class ParentRelationSet(RelationSet):
def __iter__(self): def __iter__(self):
if self.adapted.__is_dummy__: if self.adapted.__is_dummy__:
return return
for c in self.context.getParents([self.predicate]): for c in self.context.getParents([self.predicate],
noSecurityCheck=self.noSecurityCheck):
a = adapted(c, langInfo=self.langInfo) a = adapted(c, langInfo=self.langInfo)
if self.interface is None or self.interface.providedBy(a): if self.interface is None or self.interface.providedBy(a):
yield a yield a
def getRelations(self, check=None): def getRelations(self, check=None, noSecurityCheck=None):
if self.adapted.__is_dummy__: if self.adapted.__is_dummy__:
return return
for r in self.context.getParentRelations([self.predicate]): if noSecurityCheck is None:
noSecurityCheck = self.noSecurityCheck
for r in self.context.getParentRelations([self.predicate],
noSecurityCheck=noSecurityCheck):
if check is None or check(r): if check is None or check(r):
yield r yield r
def getRelated(self, check=None): def getRelated(self, check=None, noSecurityCheck=None):
for r in self.getRelations(check): for r in self.getRelations(check, noSecurityCheck):
yield adapted(r.first, langInfo=self.langInfo) yield adapted(r.first, langInfo=self.langInfo)
@ -405,14 +411,16 @@ class TypeInstancesProperty(object):
class RelationSetProperty(object): class RelationSetProperty(object):
def __init__(self, predicateName, interface=None): def __init__(self, predicateName, interface=None, noSecurityCheck=False):
self.predicateName = predicateName self.predicateName = predicateName
self.interface = interface self.interface = interface
self.noSecurityCheck = noSecurityCheck
def __get__(self, inst, class_=None): def __get__(self, inst, class_=None):
if inst is None: if inst is None:
return self return self
return self.factory(inst, self.predicateName, self.interface) return self.factory(inst, self.predicateName, self.interface,
noSecurityCheck=self.noSecurityCheck)
def __set__(self, inst, value): def __set__(self, inst, value):
rs = self.factory(inst, self.predicateName) rs = self.factory(inst, self.predicateName)

7
concept.py
View file

@ -232,14 +232,15 @@ class Concept(Contained, Persistent):
if c not in existing: if c not in existing:
self.assignParent(c, predicate) self.assignParent(c, predicate)
def deassignChild(self, child, predicates=None, order=None): def deassignChild(self, child, predicates=None, order=None, noSecurityCheck=False):
registry = component.getUtility(IRelationRegistry) registry = component.getUtility(IRelationRegistry)
for rel in self.getChildRelations(predicates, child): for rel in self.getChildRelations(predicates, child,
noSecurityCheck=noSecurityCheck):
if order is None or rel.order == order: if order is None or rel.order == order:
registry.unregister(rel) registry.unregister(rel)
notify(DeassignmentEvent(self, rel)) notify(DeassignmentEvent(self, rel))
def deassignParent(self, parent, predicates=None): def deassignParent(self, parent, predicates=None, noSecurityCheck=False):
parent.deassignChild(self, predicates) parent.deassignChild(self, predicates)
# resource relations # resource relations