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

more fixes concerncing ordering/sorting of concepts and resources

Browse source
This commit is contained in:
Helmut Merz 2025-05-13 09:46:19 +02:00
parent 8661a653d6
commit 992a024de6
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
loops/concept.py
View file

@ -293,11 +293,14 @@ class Concept(Contained, Persistent):
predicates = predicates is None and ['r*'] or predicates predicates = predicates is None and ['r*'] or predicates
relationships = [ResourceRelation(self, None, p) for p in predicates] relationships = [ResourceRelation(self, None, p) for p in predicates]
if sort == 'default': if sort == 'default':
sort = lambda x: (x.order, x.second.title.lower()) sort = lambda x: (x.order or 0,
(x.second.title and x.second.title.lower() or ''))
rels = (r for r in getRelations(self, resource, relationships=relationships, rels = (r for r in getRelations(self, resource, relationships=relationships,
usePredicateIndex=usePredicateIndex) usePredicateIndex=usePredicateIndex)
if canListObject(r.second, noSecurityCheck) and if canListObject(r.second, noSecurityCheck) and
IResource.providedBy(r.second)) IResource.providedBy(r.second))
if sort is None:
return rels
return sorted(rels, key=sort) return sorted(rels, key=sort)
def getResources(self, predicates=None, sort='default', def getResources(self, predicates=None, sort='default',
@ -337,9 +340,12 @@ class Concept(Contained, Persistent):
relationships = ([ResourceRelation(self, None, p) for p in predicates] relationships = ([ResourceRelation(self, None, p) for p in predicates]
+ [ConceptRelation(None, self, p) for p in predicates]) + [ConceptRelation(None, self, p) for p in predicates])
if sort == 'default': if sort == 'default':
sort = lambda x: (x.order, x.second.title.lower()) sort = lambda x: (x.order or 0,
(x.second.title and x.second.title.lower() or ''))
rels = (r for r in getRelations(self, child, relationships=relationships) rels = (r for r in getRelations(self, child, relationships=relationships)
if canListObject(r.second)) if canListObject(r.second))
if sort is None:
return rels
return sorted(rels, key=sort) return sorted(rels, key=sort)