Merge branch 'master' into test/views

This commit is contained in:
Aurélien Delobelle 2017-10-24 16:45:26 +02:00
commit 8cdb4c62fc
36 changed files with 1049 additions and 388 deletions

View file

@ -782,9 +782,9 @@ def catalogue(request, request_type):
.select_related('location')
.prefetch_related('quote_set')
)
if categories_id:
if categories_id and 0 not in categories_id:
shows_qs = shows_qs.filter(category__id__in=categories_id)
if locations_id:
if locations_id and 0 not in locations_id:
shows_qs = shows_qs.filter(location__id__in=locations_id)
# On convertit les descriptions à envoyer en une liste facilement