From: Radek Czajka Date: Mon, 30 Dec 2019 23:41:41 +0000 (+0100) Subject: fixes X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/53e806828568c2b4b67125e8e82191e93c95a7d9?ds=inline;hp=5e8e1de576bdd40292dc632c82cdbe272eee84af fixes --- diff --git a/src/catalogue/views.py b/src/catalogue/views.py index b110b01c0..2ef0d3bf0 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -205,7 +205,7 @@ def theme_list(request, tags, list_type): # TODO: Pictures on shelves not supported yet. books = Book.tagged.with_all(shelf_tags).order_by() fragments = fragments.filter(Q(book__in=books) | Q(book__ancestor__in=books)) - else: + elif list_type == 'books': fragments = fragments.filter(book__findable=True) if not fragments and len(tags) == 1 and list_type == 'books': diff --git a/src/picture/templates/picture/picture_viewer.html b/src/picture/templates/picture/picture_viewer.html index 3bd27b66b..7a13650c2 100644 --- a/src/picture/templates/picture/picture_viewer.html +++ b/src/picture/templates/picture/picture_viewer.html @@ -80,7 +80,7 @@ {% block footer %} - {{ picture.html_file.read|safe }} + {{ picture.html_file.read.decode|safe }}