diff --git a/apps/main/views/common.py b/apps/main/views/common.py index aa4c2db0..b93096b4 100644 --- a/apps/main/views/common.py +++ b/apps/main/views/common.py @@ -145,10 +145,6 @@ class ContentPageRetrieveView(NewsMixinView, generics.RetrieveAPIView): def get(self, request, *args, **kwargs): instance = self.get_object() - - if instance is None: - raise Http404 - return Response(instance.description.get(request.locale)) @@ -162,10 +158,6 @@ class ContentPageIdRetrieveView(generics.RetrieveAPIView): def get(self, request, *args, **kwargs): instance = self.get_object() - - if instance is None: - raise Http404 - return Response(instance.description.get(request.locale)) diff --git a/apps/news/views.py b/apps/news/views.py index 5429b4a7..4f0adc1e 100644 --- a/apps/news/views.py +++ b/apps/news/views.py @@ -1,5 +1,6 @@ """News app views.""" from django.conf import settings +from django.http import Http404 from django.shortcuts import get_object_or_404 from django.utils import translation from rest_framework import generics, permissions, response @@ -40,8 +41,14 @@ class NewsMixinView: return qs def get_object(self): - return self.get_queryset() \ - .filter(slugs__values__contains=[self.kwargs['slug']]).first() + instance = self.get_queryset().filter( + slugs__values__contains=[self.kwargs['slug']] + ).first() + + if instance is None: + raise Http404 + + return instance class NewsListView(NewsMixinView, generics.ListAPIView):