Django 1.7, working version.

[wolnelektury.git] / apps / picture / views.py

diff --git a/apps/picture/views.py b/apps/picture/views.py
index c39969a..11b08bc 100644 (file)
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -1,10 +1,13 @@
-
+# -*- coding: utf-8 -*-
+# 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.utils.datastructures import SortedDict
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
-from django.core.paginator import Paginator
 from picture.models import Picture
+from catalogue.utils import split_tags
 
 # 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):
@@ -13,7 +16,7 @@ def picture_list(request, filter=None, get_filter=None, template_name='catalogue
     if get_filter:
         filt = get_filter()
     pictures_by_author, orphans = Picture.picture_list(filt)
-    books_nav = SortedDict()
+    books_nav = OrderedDict()
     for tag in pictures_by_author:
         if pictures_by_author[tag]:
             books_nav.setdefault(tag.sort_key[0], []).append(tag)
@@ -28,18 +31,22 @@ def picture_list_thumb(request, filter=None, get_filter=None, template_name='pic
         book_list = book_list.filter(filter)
     if get_filter:
         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))
 
 def picture_detail(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
 
-    categories = SortedDict()
-    for tag in picture.tags.iterator():
-        categories.setdefault(tag.category, []).append(tag)
+    theme_things = split_tags(picture.related_themes())
+
+    # categories = SortedDict()
+    # for tag in picture.tags.iterator():
+    #     categories.setdefault(tag.category, []).append(tag)
 
-    themes = categories.get('theme', [])
-    things = categories.get('thing', [])
+    themes = theme_things.get('theme', [])
+    things = theme_things.get('thing', [])
 
     extra_info = picture.extra_info
 
@@ -49,10 +56,9 @@ def picture_detail(request, slug):
 
 def picture_viewer(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
-    
     return render_to_response("picture/picture_viewer.html", locals(),
                               context_instance=RequestContext(request))
-                              
+
 
 # =========
 # = Admin =