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

Added check to news mixin

Browse Source
This commit is contained in:
dormantman 2020-01-23 17:59:18 +03:00
parent 79001be037
commit f899de0369
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/main/views/common.py
View File

@ -145,10 +145,6 @@ class ContentPageRetrieveView(NewsMixinView, generics.RetrieveAPIView):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
instance = self.get_object() instance = self.get_object()
if instance is None:
raise Http404
return Response(instance.description.get(request.locale)) return Response(instance.description.get(request.locale))
@ -162,10 +158,6 @@ class ContentPageIdRetrieveView(generics.RetrieveAPIView):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
instance = self.get_object() instance = self.get_object()
if instance is None:
raise Http404
return Response(instance.description.get(request.locale)) return Response(instance.description.get(request.locale))

11
apps/news/views.py
View File

@ -1,5 +1,6 @@
"""News app views.""" """News app views."""
from django.conf import settings from django.conf import settings
from django.http import Http404
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.utils import translation from django.utils import translation
from rest_framework import generics, permissions, response from rest_framework import generics, permissions, response
@ -40,8 +41,14 @@ class NewsMixinView:
return qs return qs
def get_object(self): def get_object(self):
return self.get_queryset() \ instance = self.get_queryset().filter(
.filter(slugs__values__contains=[self.kwargs['slug']]).first() slugs__values__contains=[self.kwargs['slug']]
).first()
if instance is None:
raise Http404
return instance
class NewsListView(NewsMixinView, generics.ListAPIView): class NewsListView(NewsMixinView, generics.ListAPIView):