diff --git a/apps/tag/views.py b/apps/tag/views.py index e56447bc..6ad7f20a 100644 --- a/apps/tag/views.py +++ b/apps/tag/views.py @@ -1,17 +1,12 @@ """Tag views.""" from django.conf import settings -from rest_framework import generics -from rest_framework import mixins -from rest_framework import permissions -from rest_framework import status -from rest_framework import viewsets +from rest_framework import generics, mixins, permissions, status, viewsets from rest_framework.decorators import action from rest_framework.response import Response from location.models import WineRegion -from tag import filters -from tag import models -from tag import serializers +from product.models import ProductType +from tag import filters, models, serializers class ChosenTagsView(generics.ListAPIView, viewsets.GenericViewSet): @@ -61,14 +56,9 @@ class TagCategoryViewSet(mixins.ListModelMixin, viewsets.GenericViewSet): # User`s views & viewsets -class FiltersTagCategoryViewSet(mixins.ListModelMixin, viewsets.GenericViewSet): +class FiltersTagCategoryViewSet(TagCategoryViewSet): """ViewSet for TagCategory model.""" - filterset_class = filters.TagCategoryFilterSet - pagination_class = None - permission_classes = (permissions.AllowAny,) - queryset = models.TagCategory.objects.with_tags().with_base_related(). \ - distinct() serializer_class = serializers.FiltersTagCategoryBaseSerializer def list(self, request, *args, **kwargs): @@ -114,7 +104,7 @@ class FiltersTagCategoryViewSet(mixins.ListModelMixin, viewsets.GenericViewSet): } result_list.append(toques) - if filter_flags['wine_region']: + if request.query_params.get('product_type') == ProductType.WINE: wine_region_id = query_params.get('wine_region_id__in') if str(wine_region_id).isdigit():