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

fix for history admin crashing when company is null

Browse Source
This commit is contained in:
Sam
2021-03-10 11:41:02 +00:00
parent aa9a6bdf81
commit d01d5bf407
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
products/views.py
View File

@@ -29,7 +29,7 @@ from products.serializers import ProductSerializer, TagFilterSerializer, SearchR
from companies.models import Company
from stats.models import StatsLog
from back_latienda.permissions import IsCreator, IsSiteAdmin, ReadOnly
from .utils import extract_search_filters, find_related_products_v6, product_loader, find_related_products_v7
from .utils import extract_search_filters, ranked_product_search, product_loader, get_related_products
from utils.tag_serializers import TaggitSerializer
from utils.tag_filters import ProductTagFilter, ProductOrderFilter
@@ -59,7 +59,7 @@ class ProductViewSet(viewsets.ModelViewSet):
"""
# TODO: find the most similar products
product = self.get_object()
qs = find_related_products_v7(product.description, product.tags.all(), product.attributes.all(), product.category)
qs = get_related_products(product.description, product.tags.all(), product.attributes.all(), product.category)
serializer = self.serializer_class(qs, many=True)
return Response(data=serializer.data)
@@ -195,7 +195,7 @@ def product_search(request):
# split query string into single words
chunks = q.split(' ')
for chunk in chunks:
product_set, min_price, max_price = find_related_products_v6(chunk, shipping_cost, discount, category, tags, price_min, price_max)
product_set, min_price, max_price = ranked_product_search(chunk, shipping_cost, discount, category, tags, price_min, price_max)
# update price values
if product_set:
if prices['min'] is None or min_price['price__min'] < prices['min']: