fixes

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index b110b01..2ef0d3b 100644 (file)
--- 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))
         # 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':
         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 3bd27b6..7a13650 100644 (file)
--- a/src/picture/templates/picture/picture_viewer.html
+++ b/src/picture/templates/picture/picture_viewer.html
@@ -80,7 +80,7 @@
 
 
 {% block footer %}
 
 
 {% block footer %}

-  {{ picture.html_file.read|safe }}
+  {{ picture.html_file.read.decode|safe }}

 
   <div id="info" class="box">
     <div class="sponsors">
 
   <div id="info" class="box">
     <div class="sponsors">