Merge branch 'master' into rwd

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

diff --git a/apps/picture/views.py b/apps/picture/views.py
index f98d749..4d5d854 100644 (file)
--- a/apps/picture/views.py
+++ b/apps/picture/views.py
@@ -29,15 +29,15 @@ 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)
     book_list = list(book_list)

-    book_list.sort(lambda a,b: cmp(a.extra_info['authors'][0], b.extra_info['authors'][0]))

     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)
 

-    theme_things = split_tags(picture.related_themes_things())
+    theme_things = split_tags(picture.related_themes())

 
     # categories = SortedDict()
     # for tag in picture.tags.iterator():
 
     # categories = SortedDict()
     # for tag in picture.tags.iterator():