more api changes, preparing for Android app

[wolnelektury.git] / apps / catalogue / templatetags / catalogue_tags.py

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 3a60a06..c931e48 100644 (file)
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -141,9 +141,19 @@ def book_tree(book_list, books_by_parent):
 
 @register.simple_tag
 def all_editors(extra_info):
+    editors = []
+    if 'editors' in extra_info:
+        editors += extra_info['editors']
+    if 'technical_editors' in extra_info:
+        editors += extra_info['technical_editors']
+    # support for extra_info-s from librarian<1.2
+    if 'editor' in extra_info:
+        editors.append(extra_info['editor'])
+    if 'technical_editor' in extra_info:
+        editors.append(extra_info['technical_editor'])
     return ', '.join(
                      ' '.join(p.strip() for p in person.rsplit(',', 1)[::-1])
-                     for person in sorted(set(extra_info['editors'] + extra_info['technical_editors'])))
+                     for person in sorted(set(editors)))
 
 
 @register.simple_tag
@@ -250,7 +260,7 @@ def tag_list(tags, choices=None):
 
 
 @register.inclusion_tag('catalogue/folded_tag_list.html')
-def folded_tag_list(tags, choices=None):
+def folded_tag_list(tags, title='', choices=None):
     tags = [tag for tag in tags if tag.count]
     if choices is None:
         choices = []
@@ -265,3 +275,7 @@ def folded_tag_list(tags, choices=None):
             some_tags_hidden = True
     return locals()
 
+
+@register.inclusion_tag('catalogue/book_info.html')
+def book_info(book):
+    return locals()