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

add LocationGroup.compiled_room and show nice subtitle

Browse source
This commit is contained in:
Laura Klünder 2016-12-23 22:42:42 +01:00
parent fb26c90085
commit 45f31c5a96
5 changed files with 84 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,13 +38,18 @@ def search_location(request, search):
words = search.split(' ')[:10]
queryset = LocationGroup.objects.filter(can_seach=True, compiled_room=True)
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)
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)
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])