X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/ae2a8df21e1038038cf898eb5a9d09b9ecc33f8f..11135898543370ecf4ffa95dbea14cba4c33f57c:/src/cover/views.py?ds=sidebyside diff --git a/src/cover/views.py b/src/cover/views.py index 39b12f91..302f5f52 100644 --- a/src/cover/views.py +++ b/src/cover/views.py @@ -65,7 +65,11 @@ def preview(request, book, chunk=None, rev=None): cover_class = request.GET.get('cover_class', 'default') - cover = make_cover(info, cover_class=cover_class, width=width, height=height) + kwargs = {} + if chunk.book.project is not None: + if chunk.book.project.logo_mono or chunk.book.project.logo: + kwargs['cover_logo'] = (chunk.book.project.logo_mono or chunk.book.project.logo).path + cover = make_cover(info, cover_class=cover_class, width=width, height=height, **kwargs) response = HttpResponse(content_type=cover.mime_type()) img = cover.final_image() img.save(response, cover.format) @@ -146,9 +150,14 @@ def image_file(request, pk): @active_tab('cover') def image_list(request): + qs = Image.objects.all().order_by('-id') + only_unused = request.GET.get('unused') + if only_unused: + qs = qs.filter(book=None) return render(request, "cover/image_list.html", { - 'object_list': Image.objects.all().order_by('-id'), + 'object_list': qs, 'can_add': request.user.has_perm('cover.add_image'), + 'only_unused': only_unused, })