phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix product view mixins

Browse Source
This commit is contained in:
Anatoly 2019-11-20 12:41:36 +03:00
parent 0639aee494
commit d3faacba3b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/product/models.py
View File

@ -265,8 +265,10 @@ class Product(GalleryModelMixin, TranslatedFieldsMixin, BaseAttributes, HasTagsM
@property @property
def related_tags(self): def related_tags(self):
return super().visible_tags.exclude(category__index_name__in=['sugar-content', 'wine-color', return super().visible_tags.exclude(category__index_name__in=[
'bottles-produced','serial-number', 'grape-variety']) 'sugar-content', 'wine-color', 'bottles-produced',
'serial-number', 'grape-variety']
)
@property @property
def display_name(self): def display_name(self):

4
apps/product/views/common.py
View File

@ -17,7 +17,6 @@ class ProductBaseView(generics.GenericAPIView):
return Product.objects.published() \ return Product.objects.published() \
.with_base_related() \ .with_base_related() \
.annotate_in_favorites(self.request.user) \ .annotate_in_favorites(self.request.user) \
.by_country_code(self.request.country_code) \
.order_by('-created') .order_by('-created')
@ -27,7 +26,8 @@ class ProductListView(ProductBaseView, generics.ListAPIView):
filter_class = filters.ProductFilterSet filter_class = filters.ProductFilterSet
def get_queryset(self): def get_queryset(self):
qs = super().get_queryset().with_extended_related() qs = super().get_queryset().with_extended_related() \
.by_country_code(self.request.country_code)
return qs return qs