librarian<1.2 compatibility fix

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 3a60a06..ac783c0 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):
 
 @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])
     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
 
 
 @register.simple_tag

diff --git a/wolnelektury/templates/catalogue/book_text.html b/wolnelektury/templates/catalogue/book_text.html
index 34232ec..c14574a 100644 (file)
--- a/wolnelektury/templates/catalogue/book_text.html
+++ b/wolnelektury/templates/catalogue/book_text.html
@@ -44,7 +44,7 @@
               <p>{{ book.get_extra_info_value.description }}</p>
             {% endif %}
 
               <p>{{ book.get_extra_info_value.description }}</p>
             {% endif %}
 

-            {% if book.get_extra_info_value.editors or book.get_extra_info_value.technical_editors %}
+            {% if book.get_extra_info_value.editor or book.get_extra_info_value.technical_editor %}

               <p>{% trans "Edited and annotated by:" %}
                   {% all_editors book.get_extra_info_value %}.</p>
             {% endif %}
               <p>{% trans "Edited and annotated by:" %}
                   {% all_editors book.get_extra_info_value %}.</p>
             {% endif %}