Django 1.7, working version.

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 65b9c6c..0026b0a 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -2,6 +2,7 @@
 # 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
 import re
 import itertools
 
@@ -9,18 +10,17 @@ from django.conf import settings
 from django.core.cache import get_cache
 from django.template import RequestContext
 from django.template.loader import render_to_string
-from django.shortcuts import render_to_response, get_object_or_404, redirect
-from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
+from django.shortcuts import render_to_response, get_object_or_404
+from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect, JsonResponse
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.contrib.auth.decorators import login_required, user_passes_test
-from django.utils.datastructures import SortedDict
 from django.utils.http import urlquote_plus
 from django.utils import translation
 from django.utils.translation import get_language, ugettext as _, ugettext_lazy
 from django.views.decorators.vary import vary_on_headers
 
-from ajaxable.utils import JSONResponse, AjaxableFormView
+from ajaxable.utils import AjaxableFormView
 from catalogue import models
 from catalogue import forms
 from catalogue.utils import split_tags, MultiQuerySet, SortedMultiQuerySet
@@ -30,14 +30,14 @@ from pdcounter import views as pdcounter_views
 from suggest.forms import PublishingSuggestForm
 from picture.models import Picture, PictureArea
 from picture.views import picture_list_thumb
-import logging
+
 staff_required = user_passes_test(lambda user: user.is_staff)
 permanent_cache = get_cache('permanent')
 
 
 @vary_on_headers('X-Requested-With')
 def catalogue(request):
-    cache_key='catalogue.catalogue/' + get_language()
+    cache_key = 'catalogue.catalogue/' + get_language()
     output = permanent_cache.get(cache_key)
 
     if output is None:
@@ -52,8 +52,8 @@ def catalogue(request):
 
         render_tag_list = lambda x: render_to_string(
             'catalogue/tag_list.html', tag_list(x))
-        has_pictures = lambda x: filter(lambda y: y.picture_count>0, x)
-        has_books = lambda x: filter(lambda y: y.book_count>0, x)
+        has_pictures = lambda x: filter(lambda y: y.picture_count > 0, x)
+        has_books = lambda x: filter(lambda y: y.book_count > 0, x)
         def render_split(tags):
             with_books = has_books(tags)
             with_pictures = has_pictures(tags)
@@ -71,13 +71,12 @@ def catalogue(request):
                 output[category] = render_tag_list(tags)
             else:
                 output[category] = render_split(tags)
-            
-            
+
         output['collections'] = render_to_string(
             'catalogue/collection_list.html', collection_list(collections))
         permanent_cache.set(cache_key, output)
     if request.is_ajax():
-        return JSONResponse(output)
+        return JsonResponse(output)
     else:
         return render_to_response('catalogue/catalogue.html', locals(),
             context_instance=RequestContext(request))
@@ -99,7 +98,7 @@ def book_list(request, filter=None, get_filter=None,
         if get_filter:
             filter = get_filter()
         books_by_author, orphans, books_by_parent = models.Book.book_list(filter)
-        books_nav = SortedDict()
+        books_nav = OrderedDict()
         for tag in books_by_author:
             if books_by_author[tag]:
                 books_nav.setdefault(tag.sort_key[0], []).append(tag)
@@ -213,8 +212,8 @@ def tagged_object_list(request, tags=''):
         fragment_keys = [fragment.pk for fragment in fragments.iterator()]
         if fragment_keys:
             related_tags = models.Fragment.tags.usage(counts=True,
-                                filters={'pk__in': fragment_keys},
-                                extra={'where': ["catalogue_tag.category != 'book'"]})
+                                filters={'pk__in': fragment_keys}).exclude(
+                                category='book')
             related_tags = (tag for tag in related_tags if tag not in fragment_tags)
             categories = split_tags(related_tags, categories)
 
@@ -224,8 +223,8 @@ def tagged_object_list(request, tags=''):
         if area_keys:
             related_tags = PictureArea.tags.usage(counts=True,
                                                          filters={'pk__in': area_keys})
-            related_tags = (tag for tag in related_tags if tag not in fragment_tags)     
-                                                      
+            related_tags = (tag for tag in related_tags if tag not in fragment_tags)
+
             categories = split_tags(related_tags, categories)
 
         # we want the Pictures to go first
@@ -238,7 +237,7 @@ def tagged_object_list(request, tags=''):
             books = models.Book.tagged_top_level(tags).order_by('sort_key_author')
 
         pictures = Picture.tagged.with_all(tags).order_by('sort_key_author')
-            
+
         related_counts = {}
         if books.count() > 0:
             # get related tags from `tag_counter` and `theme_counter`
@@ -496,7 +495,7 @@ def find_best_matches(query, user=None):
     book_titles = set(match.pretty_title().lower() for match in result
                       if isinstance(match, models.Book))
     authors = set(match.name.lower() for match in result
-                  if isinstance(match, models.Tag) and match.category=='author')
+                  if isinstance(match, models.Tag) and match.category == 'author')
     result = tuple(res for res in result if not (
                  (isinstance(res, pdcounter_models.BookStub) and res.pretty_title().lower() in book_titles)
                  or (isinstance(res, pdcounter_models.Author) and res.name.lower() in authors)
@@ -565,7 +564,7 @@ def json_tags_starting_with(request, callback=None):
         result = [prefix, tags_list]
     else:
         result = {"matches": tags_list}
-    return JSONResponse(result, callback)
+    return JsonResponse(result, callback)
 
 
 # =========