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

besser queryset mode values in location api

Browse source
This commit is contained in:
Laura Klünder 2017-10-28 12:38:29 +02:00
parent 7632ce39ae
commit 1536fb0e10
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c3nav/mapdata/api.py
View file

@ -228,9 +228,9 @@ class LocationViewSet(RetrieveModelMixin, GenericViewSet):
for model in get_submodels(Location): for model in get_submodels(Location):
related_name = model._meta.default_related_name related_name = model._meta.default_related_name
condition = Q(**{related_name+'__isnull': False}) condition = Q(**{related_name+'__isnull': False})
if mode == 1: if mode == 'search':
condition &= Q(**{related_name+'__can_search': True}) condition &= Q(**{related_name+'__can_search': True})
elif mode == 2: elif mode == 'search-describe':
condition &= Q(**{related_name+'__can_search': True, related_name+'__can_describe': True}) condition &= Q(**{related_name+'__can_search': True, related_name+'__can_describe': True})
# noinspection PyUnresolvedReferences # noinspection PyUnresolvedReferences
condition &= model.q_for_request(self.request, prefix=related_name+'__') condition &= model.q_for_request(self.request, prefix=related_name+'__')
@ -263,7 +263,7 @@ class LocationViewSet(RetrieveModelMixin, GenericViewSet):
) )
queryset = cache.get(queryset_cache_key, None) queryset = cache.get(queryset_cache_key, None)
if queryset is None: if queryset is None:
queryset = self.get_queryset(mode=(1 if search else 2)) queryset = self.get_queryset(mode=('search' if search else 'search-describe'))
cache.set(queryset_cache_key, queryset, 300) cache.set(queryset_cache_key, queryset, 300)
result = tuple(obj.get_child().serialize(include_type=True, detailed=detailed, geometry=geometry) result = tuple(obj.get_child().serialize(include_type=True, detailed=detailed, geometry=geometry)