X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/5bd864493e531e5600c5ca989825d89cc3ee1487..f2b4341b32254061ebd70a865066e7518de22ac8:/src/catalogue/templatetags/catalogue_tags.py

diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py
index 718ffd358..67ba553af 100644
--- a/src/catalogue/templatetags/catalogue_tags.py
+++ b/src/catalogue/templatetags/catalogue_tags.py
@@ -106,7 +106,7 @@ def nice_title_from_tags(tags, related_tags):
             # No info on genre, but there's only one kind related.
             subpieces = []
             pieces.append([
-                t.collective_noun or t.name for t in self['kind']
+                t.collective_noun or t.name for t in related_tags['kind']
             ])
             plural = False
         else:
@@ -131,9 +131,9 @@ def nice_title_from_tags(tags, related_tags):
     p = []
     for sublist in pieces:
         for item in sublist[:-2]:
-            p.append(item) + ','
+            p.append(item + ',')
         for item in sublist[-2:-1]:
-            p.append(item) + ' i'
+            p.append(item + ' i')
         p.append(sublist[-1])
 
     return ' '.join(p)
@@ -413,16 +413,29 @@ def related_books(context, instance, limit=6, random=1, taken=0):
 
 
 @register.simple_tag
-def related_books_2022(instance, limit=4, taken=0):
+def related_books_2022(book=None, picture=None, limit=4, taken=0):
     limit -= taken
     max_books = limit
 
     books_qs = Book.objects.filter(findable=True)
-    books_qs = books_qs.exclude(common_slug=instance.common_slug).exclude(ancestor=instance)
+    if book is not None:
+        books_qs = books_qs.exclude(common_slug=book.common_slug).exclude(ancestor=book)
+    instance = book or picture
     books = Book.tagged.related_to(instance, books_qs)[:max_books]
 
     return books
-    
+
+@register.simple_tag
+def related_pictures_2022(book=None, picture=None, limit=4, taken=0):
+    limit -= taken
+    max_books = limit
+
+    books_qs = Picture.objects.all()
+    instance = book or picture
+    books = Picture.tagged.related_to(instance, books_qs)[:max_books]
+
+    return books
+
 
 @register.simple_tag
 def download_audio(book, daisy=True, mp3=True):
@@ -548,6 +561,8 @@ def content_warning(book):
 @register.inclusion_tag('catalogue/preview_ad.html', takes_context=True)
 def preview_ad(context):
     book = Book.objects.filter(parent=None, preview=True).first()
+    if book is None:
+        return {}
     return {
         'accessible': book.is_accessible_to(context['request'].user),
         'book': book,
@@ -556,6 +571,8 @@ def preview_ad(context):
 @register.inclusion_tag('catalogue/preview_ad_homepage.html', takes_context=True)
 def preview_ad_homepage(context):
     book = Book.objects.filter(parent=None, preview=True).first()
+    if book is None:
+        return {}
     return {
         'accessible': book.is_accessible_to(context['request'].user),
         'book': book,