From 4a6b5644b971d067f20fc05866b837dc30264f07 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20St=C4=99pniowski?= Date: Fri, 22 Aug 2008 14:15:43 +0200 Subject: [PATCH 1/1] Added view tagged_object_list to newtagging app and refactored catalogue.views.tagged_book_list with help of this view. --- catalogue/views.py | 42 +++++++++----------- newtagging/views.py | 47 +++++++++++++++++++++++ templates/catalogue/tagged_book_list.html | 4 +- 3 files changed, 68 insertions(+), 25 deletions(-) create mode 100644 newtagging/views.py diff --git a/catalogue/views.py b/catalogue/views.py index 2f4b30ff5..d5b4f69d1 100644 --- a/catalogue/views.py +++ b/catalogue/views.py @@ -6,13 +6,19 @@ from django.core.urlresolvers import reverse from django.db.models import Q from django.contrib.auth.decorators import login_required from django.utils.datastructures import SortedDict -from django.views.decorators.http import require_GET, require_POST +from django.views.decorators.http import require_POST from django.contrib import auth from django.contrib.auth.forms import UserCreationForm, AuthenticationForm 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 + + class LazyEncoder(simplejson.JSONEncoder): def default(self, obj): if isinstance(obj, Promise): @@ -20,11 +26,6 @@ class LazyEncoder(simplejson.JSONEncoder): return obj -from catalogue import models -from catalogue import forms -from catalogue.utils import split_tags - - def catalogue_redirect(request, tags=''): if len(request.GET['q']) > 0: try: @@ -97,31 +98,26 @@ def tagged_book_list(request, tags=''): if 'q' in request.GET: return catalogue_redirect(request, tags) - choices_split = tags.split('/') - tags = [] - for tag in choices_split: - tag = get_object_or_404(models.Tag, slug=tag) - if tag.category == 'set' and (not request.user.is_authenticated() or request.user != tag.user): - raise Http404 - tags.append(tag) + try: + tags = models.Tag.get_tag_list(tags) + except models.Tag.DoesNotExist: + raise Http404 - books = models.Book.objects.with_all(tags) - 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]}) categories = split_tags(related_tags) - - form = forms.SearchForm() - - return render_to_response('catalogue/tagged_book_list.html', dict( + + return tagged_object_list( + request, + tag_model=models.Tag, + queryset_or_model=models.Book, tags=tags, - form=form, - books=books, - categories=categories, - ), context_instance=RequestContext(request)) + template_name='catalogue/tagged_book_list.html', + extra_context = {'categories': categories, 'form': forms.SearchForm() }, + ) def book_detail(request, slug): diff --git a/newtagging/views.py b/newtagging/views.py new file mode 100644 index 000000000..150a08477 --- /dev/null +++ b/newtagging/views.py @@ -0,0 +1,47 @@ +""" +Tagging related views. +""" +from django.http import Http404 +from django.utils.translation import ugettext as _ +from django.views.generic.list_detail import object_list + + +def tagged_object_list(request, queryset_or_model=None, tag_model=None, tags=None, + related_tags=False, related_tag_counts=True, **kwargs): + """ + A thin wrapper around + ``django.views.generic.list_detail.object_list`` which creates a + ``QuerySet`` containing instances of the given queryset or model + tagged with the given tag. + + In addition to the context variables set up by ``object_list``, a + ``tag`` context variable will contain the ``Tag`` instance for the + tag. + + If ``related_tags`` is ``True``, a ``related_tags`` context variable + will contain tags related to the given tag for the given model. + Additionally, if ``related_tag_counts`` is ``True``, each related + tag will have a ``count`` attribute indicating the number of items + which have it in addition to the given tag. + """ + # Check attributes + if queryset_or_model is None: + raise AttributeError(_('tagged_object_list must be called with a queryset or a model.')) + if tag_model is None: + raise AttributeError(_('tagged_object_list must be called with a tag model.')) + if tags is None: + raise AttributeError(_('tagged_object_list must be called with a tag.')) + + tag_instances = tag_model.get_tag_list(tags) + if tag_instances is None: + raise Http404(_('No tags found matching "%s".') % tags) + queryset = tag_model.intermediary_table_model.objects.get_intersection_by_model(queryset_or_model, tag_instances) + if not kwargs.has_key('extra_context'): + kwargs['extra_context'] = {} + kwargs['extra_context']['tags'] = tag_instances + if related_tags: + kwargs['extra_context']['related_tags'] = \ + tag_model.objects.related_for_model(tag_instances, queryset_or_model, + counts=related_tag_counts) + return object_list(request, queryset, **kwargs) + diff --git a/templates/catalogue/tagged_book_list.html b/templates/catalogue/tagged_book_list.html index 35dcf1312..3fd8e7255 100644 --- a/templates/catalogue/tagged_book_list.html +++ b/templates/catalogue/tagged_book_list.html @@ -63,7 +63,7 @@ - {% autopaginate books 10 %} + {% autopaginate object_list 10 %}
{% with tags|last as last_tag %} {% if last_tag.has_description %} @@ -74,7 +74,7 @@ {% endif %} {% endwith %}
    - {% for book in books %} + {% for book in object_list %}
  1. {% include "catalogue/_book.html" %}
    2. {% endfor %}
-- 2.20.1