X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/03b16118bd180d3c09452174fd2d4546945d0c48..83559fba0846ad77721b31231d1d807a91e52157:/catalogue/views.py diff --git a/catalogue/views.py b/catalogue/views.py index ed0436e64..8feb63c22 100644 --- a/catalogue/views.py +++ b/catalogue/views.py @@ -13,10 +13,10 @@ from django.utils import simplejson from django.utils.functional import Promise from django.utils.encoding import force_unicode -from newtagging.views import tagged_object_list from catalogue import models from catalogue import forms from catalogue.utils import split_tags +from newtagging import views as newtagging_views class LazyEncoder(simplejson.JSONEncoder): @@ -36,7 +36,6 @@ def search(request): tag_list = models.Tag.get_tag_list(tags) tag = models.Tag.objects.get(name=query) except models.Tag.DoesNotExist: - print "%r, %r" % (query, tags) try: book = models.Book.objects.get(title=query) return HttpResponseRedirect(book.get_absolute_url()) @@ -44,7 +43,7 @@ def search(request): return HttpResponseRedirect(reverse('catalogue.views.main_page')) else: tag_list.append(tag) - return HttpResponseRedirect(reverse('catalogue.views.tagged_book_list', + return HttpResponseRedirect(reverse('catalogue.views.tagged_object_list', kwargs={'tags': '/'.join(tag.slug for tag in tag_list)} )) @@ -76,6 +75,8 @@ def main_page(request): else: extra_where = 'NOT catalogue_tag.category = "set"' tags = models.Tag.objects.usage_for_model(models.Book, counts=True, extra={'where': [extra_where]}) + fragment_tags = models.Tag.objects.usage_for_model(models.Fragment, counts=True, + extra={'where': ['catalogue_tag.category = "theme"']}) categories = split_tags(tags) form = forms.SearchForm() @@ -95,25 +96,30 @@ def book_list(request): context_instance=RequestContext(request)) -def tagged_book_list(request, tags=''): +def tagged_object_list(request, tags=''): try: tags = models.Tag.get_tag_list(tags) except models.Tag.DoesNotExist: raise Http404 - + + model = models.Book + theme_is_set = any(tag.category == 'theme' for tag in tags) + if theme_is_set: + model = models.Fragment + if request.user.is_authenticated(): extra_where = '(NOT catalogue_tag.category = "set" OR catalogue_tag.user_id = %d)' % request.user.id else: extra_where = 'NOT catalogue_tag.category = "set"' - related_tags = models.Tag.objects.related_for_model(tags, models.Book, counts=True, extra={'where': [extra_where]}) + related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]}) categories = split_tags(related_tags) - return tagged_object_list( + return newtagging_views.tagged_object_list( request, tag_model=models.Tag, - queryset_or_model=models.Book, + queryset_or_model=model, tags=tags, - template_name='catalogue/tagged_book_list.html', + template_name='catalogue/tagged_object_list.html', extra_context = {'categories': categories }, )