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

load RecipeFilter cookbook entries

Browse Source
This commit is contained in:
Chris Scoggins
2022-01-27 10:21:05 -06:00
parent c042ab08c7
commit 07d5ead128
5 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cookbook/helper/recipe_search.py
View File

@@ -25,10 +25,11 @@ class RecipeSearch():
def __init__(self, request, **params):
self._request = request
self._queryset = None
if filter := params.get('filter', None):
try:
self._params = {**json.loads(CustomFilter.objects.get(id=filter).search)}
except CustomFilter.DoesNotExist:
if f := params.get('filter', None):
filter = CustomFilter.objects.filter(id=f, space=self._request.space).filter(Q(created_by=self._request.user) | Q(shared=self._request.user)).first()
if filter:
self._params = {**json.loads(filter.search)}
else:
self._params = {**(params or {})}
else:
self._params = {**(params or {})}
@@ -116,9 +117,7 @@ class RecipeSearch():
self.unit_filters(units=self._units)
self.string_filters(string=self._string)
self._makenow_filter()
# self._queryset = self._queryset.distinct() # TODO 2x check. maybe add filter of recipe__in after orderby
return self._queryset.filter(space=self._request.space).order_by(*self.orderby)
return self._queryset.filter(space=self._request.space).distinct().order_by(*self.orderby)
def _sort_includes(self, *args):
for x in args: