From 815a55f45c25a7eb46bdce12f2ef6e7a7502ffc8 Mon Sep 17 00:00:00 2001 From: Diego Calvo Date: Fri, 19 Mar 2021 14:13:24 +0100 Subject: [PATCH] real solve conflicts with categories --- products/utils.py | 8 -------- products/views.py | 8 -------- 2 files changed, 16 deletions(-) diff --git a/products/utils.py b/products/utils.py index d001a05..49d7edc 100644 --- a/products/utils.py +++ b/products/utils.py @@ -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: diff --git a/products/views.py b/products/views.py index f6f4dbc..21ddd1b 100644 --- a/products/views.py +++ b/products/views.py @@ -183,13 +183,6 @@ def product_search(request): products_qs = Product.objects.filter(active=True) # 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) - -======= descendants = [] for entry in categories: cat = CategoryTag.objects.filter(label__iexact=entry).first() @@ -198,7 +191,6 @@ def product_search(request): descendants.extend(cat.children.all()) products_qs = products_qs.filter(category__in=descendants) ->>>>>>> development # filter by tags if tags is not None: products_qs = products_qs.filter(tags__name__icontains=tags)