From 050d608d11f32122f9afba6976a4cb92b8522db4 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 25 Oct 2017 11:45:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=81=D1=82=D0=B0=D1=82=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/serializers.py | 10 +--------- library/urls.py | 1 - library/views.py | 18 ++---------------- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/library/serializers.py b/library/serializers.py index d70d0fa..708a1dd 100644 --- a/library/serializers.py +++ b/library/serializers.py @@ -8,8 +8,7 @@ class ArticleSerializer(serializers.ModelSerializer): class Meta: model = Article - exclude = ('css', 'js', 'page', 'head_title', 'public', - 'head_description', 'head_image', 'id',) + exclude = ('public', 'id',) @staticmethod def get_tags(self): @@ -18,10 +17,3 @@ class ArticleSerializer(serializers.ModelSerializer): @staticmethod def get_section(self): return self.section.name if self.section else 'undefined' - - -class ArticleDetailSerializer(ArticleSerializer): - - class Meta: - model = Article - exclude = ('id', 'public',) diff --git a/library/urls.py b/library/urls.py index f104162..0bf04dd 100644 --- a/library/urls.py +++ b/library/urls.py @@ -2,6 +2,5 @@ from django.conf.urls import url from library import views urlpatterns = [ - url(r'(?P[-\w]+)/$', views.LibraryDetailView.as_view()), url(r'$', views.LibraryListView.as_view()), ] \ No newline at end of file diff --git a/library/views.py b/library/views.py index 7996071..c5073a0 100644 --- a/library/views.py +++ b/library/views.py @@ -3,7 +3,7 @@ from rest_framework.response import Response from rest_framework.views import APIView from library.models import Article -from library.serializers import ArticleSerializer, ArticleDetailSerializer +from library.serializers import ArticleSerializer class LibraryListView(APIView): @@ -11,18 +11,4 @@ class LibraryListView(APIView): status_code = 200 def get(self, request): - return Response([ArticleSerializer(i).data for i in Article.objects.filter(public=True)], self.status_code) - - -class LibraryDetailView(APIView): - renderer_classes = (JSONRenderer,) - status_code = 200 - - def get(self, request, slug): - try: - article = Article.objects.get(slug=slug) - if not article.public: - return Response('Article not published', 403) - return Response(ArticleDetailSerializer(article).data, self.status_code) - except Article.DoesNotExist: - return Response("Article doesn't exist", status=404) \ No newline at end of file + return Response([ArticleSerializer(i).data for i in Article.objects.filter(public=True)], self.status_code) \ No newline at end of file