update django-allauth

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index cc56015..e61feb6 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -19,12 +19,13 @@ from django.utils.http import urlquote_plus
 from django.utils import translation
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.views.decorators.cache import never_cache
 from django.utils import translation
 from django.utils.translation import ugettext as _, ugettext_lazy
 from django.views.decorators.cache import never_cache

+from django.views.decorators.vary import vary_on_headers

 
 from ajaxable.utils import JSONResponse, AjaxableFormView
 
 from ajaxable.utils import JSONResponse, AjaxableFormView

-

 from catalogue import models
 from catalogue import forms
 from catalogue.utils import split_tags, MultiQuerySet
 from catalogue import models
 from catalogue import forms
 from catalogue.utils import split_tags, MultiQuerySet

+from catalogue.templatetags.catalogue_tags import tag_list, collection_list

 from pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views
 from suggest.forms import PublishingSuggestForm
 from pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views
 from suggest.forms import PublishingSuggestForm


@@ -34,6 +35,7 @@ staff_required = user_passes_test(lambda user: user.is_staff)
 permanent_cache = get_cache('permanent')
 
 
 permanent_cache = get_cache('permanent')
 
 

+@vary_on_headers('X-Requested-With')

 def catalogue(request):
     tags = models.Tag.objects.exclude(
         category__in=('set', 'book')).exclude(book_count=0)
 def catalogue(request):
     tags = models.Tag.objects.exclude(
         category__in=('set', 'book')).exclude(book_count=0)


@@ -42,9 +44,20 @@ def catalogue(request):
         tag.count = tag.book_count
     categories = split_tags(tags)
     fragment_tags = categories.get('theme', [])
         tag.count = tag.book_count
     categories = split_tags(tags)
     fragment_tags = categories.get('theme', [])

-
-    return render_to_response('catalogue/catalogue.html', locals(),
-        context_instance=RequestContext(request))
+    collections = models.Collection.objects.all()
+
+    if request.is_ajax():
+        render_tag_list = lambda x: render_to_string(
+            'catalogue/tag_list.html', tag_list(x))
+        output = {'theme': render_tag_list(fragment_tags)}
+        for category, tags in categories.items():
+            output[category] = render_tag_list(tags)
+        output['collections'] = render_to_string(
+            'catalogue/collection_list.html', collection_list(collections))
+        return JSONResponse(output)
+    else:
+        return render_to_response('catalogue/catalogue.html', locals(),
+            context_instance=RequestContext(request))

 
 
 def book_list(request, filter=None, template_name='catalogue/book_list.html',
 
 
 def book_list(request, filter=None, template_name='catalogue/book_list.html',