ordonne les adresses par leur statut principal puis par id
L'ordre doit être stable.
This commit is contained in:
parent
7c6cc46cec
commit
c477011f1f
|
@ -71,10 +71,13 @@ def parents(individu):
|
|||
|
||||
|
||||
def adresses(individu):
|
||||
adresses = []
|
||||
for relation in individu.left_relations.all():
|
||||
if relation.schema.slug != 'habite':
|
||||
continue
|
||||
yield relation.right, relation
|
||||
adresses.append((relation.right, relation))
|
||||
adresses.sort(key=lambda (a, r): (not r.content.get('principale', False), a.id))
|
||||
return adresses
|
||||
|
||||
|
||||
class PersonSearch(object):
|
||||
|
@ -275,7 +278,6 @@ class PersonSearch(object):
|
|||
adresse = adresse.content.copy()
|
||||
adresse.update(relation.content)
|
||||
individu.adresses.append(adresse)
|
||||
individu.adresses.sort(key=lambda x: int(not x['principale']))
|
||||
|
||||
@classmethod
|
||||
def add_enfants(cls, individu):
|
||||
|
|
Loading…
Reference in New Issue