kit-eco.social/consumocuidado-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

real solve conflicts with categories

Browse Source
This commit is contained in:
Diego Calvo
2021-03-19 14:13:24 +01:00
parent 3c7dfe731f
commit 815a55f45c
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
products/utils.py
View File

@@ -144,13 +144,6 @@ def ranked_product_search(keyword, shipping_cost=None, discount=None, categories
# filter by category
if categories is not None:
<<<<<<< HEAD
query = Q()
for entry in categories:
query = query | Q(category__name__contains=entry)
products_qs = products_qs.filter(query)
# products_qs = products_qs.filter(category__name__in=categories)
=======
# products_qs = products_qs.filter(category__name__in=categories)
descendants = []
for entry in categories:
@@ -160,7 +153,6 @@ def ranked_product_search(keyword, shipping_cost=None, discount=None, categories
descendants.extend(cat.children.all())
products_qs = products_qs.filter(category__in=descendants)
>>>>>>> development
# filter by tags
if tags is not None: