mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr/865' into develop

Browse Source
This commit is contained in:
vabene1111
2021-09-08 09:42:16 +02:00
parent bb8476a25a 8420995aa8
commit 68b64ba8e2
44 changed files with 791 additions and 1260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cookbook/helper/recipe_search.py
View File

@@ -20,6 +20,7 @@ def search_recipes(request, queryset, params):
search_keywords = params.getlist('keywords', [])
search_foods = params.getlist('foods', [])
search_books = params.getlist('books', [])
search_units = params.get('units', None)
# TODO I think default behavior should be 'AND' which is how most sites operate with facet/filters based on results
search_keywords_or = params.get('keywords_or', True)
@@ -159,6 +160,10 @@ def search_recipes(request, queryset, params):
else:
for k in search_books:
queryset = queryset.filter(recipebookentry__book__id=k)
# probably only useful in Unit list view, so keeping it simple
if search_units:
queryset = queryset.filter(steps__ingredients__unit__id=search_units)
if search_internal == 'true':
queryset = queryset.filter(internal=True)