2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

sort locations

Browse source
This commit is contained in:
Laura Klünder 2016-12-24 21:51:30 +01:00
parent d1534a27e8
commit 517e194c44
3 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/c3nav/mapdata/search.py
View file

@ -38,20 +38,15 @@ def search_location(request, search):
words = search.split(' ')[:10]
queryset = LocationGroup.objects.filter(can_seach=True, compiled_room=True)
queryset = LocationGroup.objects.filter(can_seach=True).order_by('name')
if isinstance(location, LocationGroup):
queryset.exclude(name='g:' + location.name)
results += list(filter_words(filter_queryset_by_access(request, queryset), words)[:10])
queryset = AreaLocation.objects.filter(can_seach=True)
queryset = AreaLocation.objects.filter(can_seach=True).order_by('name')
if isinstance(location, AreaLocation):
queryset.exclude(name=location.name)
results += sorted(filter_words(filter_arealocations_by_access(request, queryset), words),
key=AreaLocation.get_sort_key, reverse=True)
queryset = LocationGroup.objects.filter(can_seach=True, compiled_room=False)
if isinstance(location, LocationGroup):
queryset.exclude(name='g:'+location.name)
results += list(filter_words(filter_queryset_by_access(request, queryset), words)[:10])
return results