Merge branch 'master' into appdev

[wolnelektury.git] / src / catalogue / api / views.py

diff --git a/src/catalogue/api/views.py b/src/catalogue/api/views.py
index b2734d9..ed5d10f 100644 (file)
--- a/src/catalogue/api/views.py
+++ b/src/catalogue/api/views.py
@@ -406,6 +406,15 @@ class KindView(RetrieveAPIView):
     queryset = Tag.objects.filter(category='kind')
     lookup_field = 'slug'
 
     queryset = Tag.objects.filter(category='kind')
     lookup_field = 'slug'
 

+class ThemeList(ListAPIView):
+    serializer_class = serializers.ThemeSerializer
+    queryset = Tag.objects.filter(category='theme')
+
+class ThemeView(RetrieveAPIView):
+    serializer_class = serializers.ThemeSerializer
+    queryset = Tag.objects.filter(category='theme')
+    lookup_field = 'slug'
+

 
 class TagView(RetrieveAPIView):
     permission_classes = [DjangoModelPermissionsOrAnonReadOnly]
 
 class TagView(RetrieveAPIView):
     permission_classes = [DjangoModelPermissionsOrAnonReadOnly]


@@ -528,7 +537,10 @@ class BookMediaView(ListAPIView):
     pagination_class = None
 
     def get_queryset(self):
     pagination_class = None
 
     def get_queryset(self):

-        return BookMedia.objects.filter(book__slug=self.kwargs['slug'], type=self.kwargs['type']).order_by('index')
+        return BookMedia.objects.filter(
+            book__slug=self.kwargs['slug'],
+            type=self.kwargs['type']
+        ).order_by('index')

 
 
 from .tojson import conv
 
 
 from .tojson import conv


@@ -539,4 +551,3 @@ class BookJsonView(APIView):
         book = get_object_or_404(Book, slug=slug)
         js = conv(etree.parse(book.xml_file.path))
         return JsonResponse(js, json_dumps_params={'ensure_ascii': False})
         book = get_object_or_404(Book, slug=slug)
         js = conv(etree.parse(book.xml_file.path))
         return JsonResponse(js, json_dumps_params={'ensure_ascii': False})

-