CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Refs #1307 -- fix navigation hierarchies being broken by sorting

Browse Source
This commit is contained in:
Raphael Michel
2019-05-29 09:13:49 +02:00
parent 67d5c1ccad
commit 0fc448fbd3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/control/navigation.py
View File

@@ -281,7 +281,7 @@ def get_event_navigation(request: HttpRequest):
merge_in(nav, sorted( merge_in(nav, sorted(
sum((list(a[1]) for a in nav_event.send(request.event, request=request)), []), sum((list(a[1]) for a in nav_event.send(request.event, request=request)), []),
key=lambda r: r['label'] key=lambda r: (1 if r.get('parent') else 0, r['label'])
)) ))
return nav return nav
@@ -391,7 +391,7 @@ def get_global_navigation(request):
merge_in(nav, sorted( merge_in(nav, sorted(
sum((list(a[1]) for a in nav_global.send(request, request=request)), []), sum((list(a[1]) for a in nav_global.send(request, request=request)), []),
key=lambda r: r['label'] key=lambda r: (1 if r.get('parent') else 0, r['label'])
)) ))
return nav return nav
@@ -464,7 +464,7 @@ def get_organizer_navigation(request):
merge_in(nav, sorted( merge_in(nav, sorted(
sum((list(a[1]) for a in nav_organizer.send(request.organizer, request=request, organizer=request.organizer)), sum((list(a[1]) for a in nav_organizer.send(request.organizer, request=request, organizer=request.organizer)),
[]), []),
key=lambda r: r['label'] key=lambda r: (1 if r.get('parent') else 0, r['label'])
)) ))
return nav return nav