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

filters are automatically shared when part of shared book

Browse Source
This commit is contained in:
smilerz
2022-02-18 11:33:04 -06:00
committed by vabene1111
parent 6dddcadf41
commit 3b08b1406f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cookbook/helper/recipe_search.py
View File

@@ -27,12 +27,10 @@ class RecipeSearch():
self._request = request self._request = request
self._queryset = None self._queryset = None
if f := params.get('filter', None): if f := params.get('filter', None):
custom_filter = CustomFilter.objects.filter(id=f, space=self._request.space).filter(Q(created_by=self._request.user) | Q(shared=self._request.user)).first() filter = CustomFilter.objects.filter(id=f, space=self._request.space).filter(Q(created_by=self._request.user) |
if not custom_filter: Q(shared=self._request.user) | Q(recipebook__shared=self._request.user)).first()
if book := RecipeBook.objects.filter(space=self._request.space, filter=f).filter(Q(created_by=self._request.user) | Q(shared=self._request.user)).first(): if filter:
custom_filter = book.filter self._params = {**json.loads(filter.search)}
if custom_filter:
self._params = {**json.loads(custom_filter.search)}
self._original_params = {**(params or {})} self._original_params = {**(params or {})}
else: else:
self._params = {**(params or {})} self._params = {**(params or {})}