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

tune relation registry: fix for getChild- and getResourceRelations()

Browse source
This commit is contained in:
Helmut Merz 2013-02-06 12:20:41 +01:00
parent c30b524f07
commit 6aab28a004
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
concept.py
View file

@ -48,6 +48,7 @@ from loops.base import ParentInfo
from loops.common import adapted, AdapterBase from loops.common import adapted, AdapterBase
from loops.i18n.common import I18NValue from loops.i18n.common import I18NValue
from loops.interfaces import IConcept, IConceptRelation, IConceptView from loops.interfaces import IConcept, IConceptRelation, IConceptView
from loops.interfaces import IResource
from loops.interfaces import IConceptManager, IConceptManagerContained from loops.interfaces import IConceptManager, IConceptManagerContained
from loops.interfaces import ILoopsContained from loops.interfaces import ILoopsContained
from loops.interfaces import IIndexAttributes from loops.interfaces import IIndexAttributes
@ -199,7 +200,8 @@ class Concept(Contained, Persistent):
if sort == 'default': if sort == 'default':
sort = lambda x: (x.order, (x.second.title and x.second.title.lower())) sort = lambda x: (x.order, (x.second.title and x.second.title.lower()))
rels = (r for r in getRelations(self, child, relationships=relationships) rels = (r for r in getRelations(self, child, relationships=relationships)
if canListObject(r.second, noSecurityCheck)) if canListObject(r.second, noSecurityCheck) and
IConcept.providedBy(r.second))
return sorted(rels, key=sort) return sorted(rels, key=sort)
def getChildren(self, predicates=None, sort='default', noSecurityCheck=False): def getChildren(self, predicates=None, sort='default', noSecurityCheck=False):
@ -294,7 +296,8 @@ class Concept(Contained, Persistent):
if sort == 'default': if sort == 'default':
sort = lambda x: (x.order, x.second.title.lower()) sort = lambda x: (x.order, x.second.title.lower())
rels = (r for r in getRelations(self, resource, relationships=relationships) rels = (r for r in getRelations(self, resource, relationships=relationships)
if canListObject(r.second, noSecurityCheck)) if canListObject(r.second, noSecurityCheck) and
IResource.providedBy(r.second))
return sorted(rels, key=sort) return sorted(rels, key=sort)
def getResources(self, predicates=None, sort='default', noSecurityCheck=False): def getResources(self, predicates=None, sort='default', noSecurityCheck=False):