Merge branch 'obrazy' into rwd

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

diff --git a/apps/picture/views.py b/apps/picture/views.py
index 65e5fa4..4d5d854 100644 (file)
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -5,6 +5,7 @@ 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 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):
 
 # 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):


@@ -28,17 +29,24 @@ 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.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)
 
     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())

 
 

-    picture_themes = []
+    # categories = SortedDict()
+    # for tag in picture.tags.iterator():
+    #     categories.setdefault(tag.category, []).append(tag)
+
+    themes = theme_things.get('theme', [])
+    things = theme_things.get('thing', [])
+
+    extra_info = picture.extra_info

 
     return render_to_response("picture/picture_detail.html", locals(),
                               context_instance=RequestContext(request))
 
     return render_to_response("picture/picture_detail.html", locals(),
                               context_instance=RequestContext(request))


@@ -46,7 +54,6 @@ def picture_detail(request, slug):
 
 def picture_viewer(request, slug):
     picture = get_object_or_404(Picture, slug=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))
                               
     return render_to_response("picture/picture_viewer.html", locals(),
                               context_instance=RequestContext(request))