X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/357027375ff8867f42ca34bcbfb5a78b5b185fc3..46b8dca20c77629901ed4fc3d398436180649c71:/src/picture/views.py

diff --git a/src/picture/views.py b/src/picture/views.py
index 1f8738650..6b83c3501 100644
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -2,7 +2,6 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from collections import OrderedDict
 from django.contrib.auth.decorators import permission_required
 from django.shortcuts import render_to_response, get_object_or_404, render
 from django.template import RequestContext
@@ -11,23 +10,26 @@ from catalogue.utils import split_tags
 from ssify import ssi_included
 from sponsors.models import Sponsor
 
-# was picture/picture_list.html list (without thumbs)
-def picture_list(request, filter=None, get_filter=None, template_name='catalogue/picture_list.html', cache_key=None, context=None):
-    """ generates a listing of all books, optionally filtered with a test function """
 
-    if get_filter:
-        filt = get_filter()
-    pictures_by_author, orphans = Picture.picture_list(filt)
-    books_nav = OrderedDict()
-    for tag in pictures_by_author:
-        if pictures_by_author[tag]:
-            books_nav.setdefault(tag.sort_key[0], []).append(tag)
-
-    return render_to_response(template_name, locals(),
-        context_instance=RequestContext(request))
+# WTF/unused
+# # was picture/picture_list.html list (without thumbs)
+# def picture_list(request, filter=None, get_filter=None, template_name='catalogue/picture_list.html',
+#                  cache_key=None, context=None):
+#     """ generates a listing of all books, optionally filtered with a test function """
+#
+#     if get_filter:
+#         filt = get_filter()
+#     pictures_by_author, orphans = Picture.picture_list(filt)
+#     books_nav = OrderedDict()
+#     for tag in pictures_by_author:
+#         if pictures_by_author[tag]:
+#             books_nav.setdefault(tag.sort_key[0], []).append(tag)
+#
+#     return render_to_response(template_name, locals(), context_instance=RequestContext(request))
 
 
-def picture_list_thumb(request, filter=None, get_filter=None, template_name='picture/picture_list_thumb.html', cache_key=None, context=None):
+def picture_list_thumb(request, filter=None, get_filter=None, template_name='picture/picture_list_thumb.html',
+                       cache_key=None, context=None):
     book_list = Picture.objects.all()
     if filter:
         book_list = book_list.filter(filter)
@@ -35,8 +37,8 @@ def picture_list_thumb(request, filter=None, get_filter=None, template_name='pic
         book_list = book_list.filter(get_filter())
     book_list = book_list.order_by('sort_key_author')
     book_list = list(book_list)
-    return render_to_response(template_name, locals(),
-                              context_instance=RequestContext(request))
+    return render_to_response(template_name, locals(), context_instance=RequestContext(request))
+
 
 def picture_detail(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
@@ -88,7 +90,8 @@ def import_picture(request):
             info = sys.exc_info()
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
-            return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") % {'exception':exception, 'tb':tb}, mimetype='text/plain')
+            return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") %
+                                {'exception': exception, 'tb': tb}, mimetype='text/plain')
         return HttpResponse(_("Picture imported successfully"))
     else:
         return HttpResponse(_("Error importing file: %r") % import_form.errors)
@@ -97,11 +100,9 @@ def import_picture(request):
 @ssi_included
 def picture_mini(request, pk, with_link=True):
     picture = get_object_or_404(Picture, pk=pk)
-    author_str = ", ".join(tag.name
-        for tag in picture.tags.filter(category='author'))
     return render(request, 'picture/picture_mini_box.html', {
         'picture': picture,
-        'author_str': author_str,
+        'author': picture.author_unicode(),
         'with_link': with_link,
     })