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

correctly filter on api /locations/

Browse source
This commit is contained in:
Laura Klünder 2017-06-22 19:57:49 +02:00
parent 4d544610e5
commit c4b3932e9b
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -157,8 +157,13 @@ class LocationViewSet(RetrieveModelMixin, GenericViewSet):
detailed = 'detailed' in request.GET detailed = 'detailed' in request.GET
queryset = self.get_queryset().order_by('id') queryset = self.get_queryset().order_by('id')
queryset = queryset.filter(reduce(operator.or_, (Q(**{model._meta.default_related_name+'__isnull': False}) conditions = []
for model in get_submodels(Location)))) for model in get_submodels(Location):
conditions.append(Q(**{model._meta.default_related_name+'__isnull': False}) &
(Q(**{model._meta.default_related_name + '__can_search': True}) |
Q(**{model._meta.default_related_name + '__can_describe': True})))
queryset = queryset.filter(reduce(operator.or_, conditions))
if detailed: if detailed:
for model in get_submodels(Location): for model in get_submodels(Location):
if model == LocationGroup: if model == LocationGroup: