X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ccdfdb7ab5b7a4c134a60e7440ffe193cb290362..0b1d7187cd243b29566418c3b09fa8043ed53bee:/src/catalogue/api/views.py diff --git a/src/catalogue/api/views.py b/src/catalogue/api/views.py index 335a30161..885df24aa 100644 --- a/src/catalogue/api/views.py +++ b/src/catalogue/api/views.py @@ -27,7 +27,7 @@ book_tag_categories = ['author', 'epoch', 'kind', 'genre'] class CollectionList(ListAPIView): - queryset = Collection.objects.all() + queryset = Collection.objects.filter(listed=True) serializer_class = serializers.CollectionListSerializer @@ -45,7 +45,7 @@ class BookList(ListAPIView): serializer_class = serializers.BookListSerializer def get(self, request, filename=None, **kwargs): - if filename and 'count' not in request.query_params: + if filename and not kwargs.get('tags') and 'count' not in request.query_params: try: with open(os.path.join(settings.MEDIA_ROOT, 'api', '%s.%s' % (filename, request.accepted_renderer.format)), 'rb') as f: content = f.read() @@ -135,6 +135,9 @@ class BookList(ListAPIView): name = request.POST.get('name', '') part_name = request.POST.get('part_name', '') + project_description = request.POST.get('project_description', '') + project_icon = request.POST.get('project_icon', '') + _rest, slug = request.POST['book'].rstrip('/').rsplit('/', 1) book = Book.objects.get(slug=slug) @@ -146,6 +149,8 @@ class BookList(ListAPIView): bm.name = name bm.part_name = part_name bm.index = index + bm.project_description = project_description + bm.project_icon = project_icon bm.file.save(None, request.data['file'], save=False) bm.save(parts_count=parts_count)