search ui improvements and filter

This commit is contained in:
vabene1111
2021-04-18 02:55:50 +02:00
parent 880db58d38
commit f78f7dfc14
8 changed files with 74 additions and 29 deletions

View File

@@ -33,17 +33,17 @@ def search_recipes(queryset, params):
if len(search_foods) > 0:
if search_foods_or == 'true':
queryset = queryset.filter(keywords__id__in=search_foods)
queryset = queryset.filter(steps__ingredients__food__id__in=search_foods)
else:
for k in search_foods:
queryset = queryset.filter(keywords__id=k)
queryset = queryset.filter(steps__ingredients__food__id=k)
if len(search_books) > 0:
if search_books_or == 'true':
queryset = queryset.filter(keywords__id__in=search_books)
queryset = queryset.filter(recipebookentry__book__id__in=search_books)
else:
for k in search_books:
queryset = queryset.filter(keywords__id=k)
queryset = queryset.filter(recipebookentry__book__id=k)
queryset = queryset.distinct()