From 6e404619938ccba6732fc9b8a3fb6c90a27bad76 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 26 May 2010 16:51:53 +0200 Subject: [PATCH] fixing tagged_object_list --- apps/catalogue/views.py | 59 ++++++++++++++++++--------------------- apps/newtagging/models.py | 17 ++++++----- 2 files changed, 37 insertions(+), 39 deletions(-) diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index de72b046a..ea31338ff 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -26,6 +26,7 @@ from django.utils.encoding import force_unicode from django.utils.http import urlquote_plus from django.views.decorators import cache from django.utils.translation import ugettext as _ +from django.views.generic.list_detail import object_list from catalogue import models from catalogue import forms @@ -85,7 +86,7 @@ def tagged_object_list(request, tags=''): theme_is_set = [tag for tag in tags if tag.category == 'theme'] shelf_is_set = len(tags) == 1 and tags[0].category == 'set' - my_shelf_is_set = shelf_is_set and request.user.is_authenticated() and request.user == shelf[0].user + my_shelf_is_set = shelf_is_set and request.user.is_authenticated() and request.user == tags[0].user objects = only_author = pd_counter = categories = None @@ -95,48 +96,40 @@ def tagged_object_list(request, tags=''): fragments = models.Fragment.tagged.with_all(fragment_tags) if shelf_tags: - books = models.Book.tagged.with_all(shelf_tags) + books = models.Book.tagged.with_all(shelf_tags).order_by() l_tags = [models.Tag.objects.get(slug = 'l-' + book.slug) for book in books] - fragments = (fragment for fragment in models.Fragment.tagged.with_any(l_tags) if fragment in fragments) + fragments = models.Fragment.tagged.with_any(l_tags, fragments) - fragment_keys = (fragment.pk for fragment in fragments) - if fragment_keys: - related_tags = models.Fragment.tags.usage(counts=True, - filters={'pk__in': fragment_keys}, - extra={'where': ["catalogue_tag.category != 'book'"]}) - related_tags = (tag for tag in related_tags if tag not in fragment_tags) - categories = split_tags(related_tags) - - objects = fragments + related_tags = models.Tag.objects.usage_for_queryset(fragments, counts=True, + extra={'where': ["catalogue_tag.category != 'book'"]}) + related_tags = (tag for tag in related_tags if tag not in fragment_tags) + categories = split_tags(related_tags) + + objects = fragments else: - books = models.Book.tagged.with_all(tags) + books = models.Book.tagged.with_all(tags).order_by() l_tags = [models.Tag.objects.get(slug = 'l-' + book.slug) for book in books] book_keys = [book.pk for book in books] - if book_keys: - related_tags = models.Book.tags.usage(counts=True, - filters={'pk__in': book_keys}, - extra={'where': ["catalogue_tag.category NOT IN ('set', 'book', 'theme')"]}) - categories = split_tags(related_tags) - - fragment_keys = [fragment.pk for fragment in models.Fragment.tagged.with_any(l_tags)] - if fragment_keys: - categories['theme'] = models.Fragment.tags.usage(counts=True, - filters={'pk__in': fragment_keys}, - extra={'where': ["catalogue_tag.category = 'theme'"]}) - - books = books.exclude(parent__in = book_keys) - objects = books + related_tags = models.Tag.objects.usage_for_queryset(books, counts=True, + extra={'where': ["catalogue_tag.category NOT IN ('set', 'book', 'theme')"]}) + related_tags = (tag for tag in related_tags if tag not in tags) + categories = split_tags(related_tags) + + fragments = models.Fragment.tagged.with_any(l_tags) + categories['theme'] = models.Tag.objects.usage_for_queryset(fragments, counts=True, + extra={'where': ["catalogue_tag.category = 'theme'"]}) + + books = books.exclude(parent__in = book_keys) + objects = books if not objects: only_author = len(tags) == 1 and tags[0].category == 'author' pd_counter = only_author and tags[0].goes_to_pd() objects = models.Book.objects.none() - return newtagging_views.tagged_object_list( + return object_list( request, - tag_model=models.Tag, - queryset_or_model=objects, - tags=tags, + objects, template_name='catalogue/tagged_object_list.html', extra_context = { 'categories': categories, @@ -145,7 +138,9 @@ def tagged_object_list(request, tags=''): 'pd_counter': pd_counter, 'user_is_owner': my_shelf_is_set, 'formats_form': forms.DownloadFormatsForm(), - }, + + 'tags': tags, + } ) diff --git a/apps/newtagging/models.py b/apps/newtagging/models.py index 2055ec318..b70ab9a09 100644 --- a/apps/newtagging/models.py +++ b/apps/newtagging/models.py @@ -84,7 +84,7 @@ class TagManager(models.Manager): return self.filter(items__content_type__pk=ctype.pk, items__object_id=obj.pk) - def _get_usage(self, model, counts=False, min_count=None, extra_joins=None, extra_criteria=None, params=None, extra=None): + def _get_usage(self, model, counts=False, min_count=None, extra_joins=None, extra_criteria=None, params=None, extra=None, extra_tables=None): """ Perform the custom SQL query for ``usage_for_model`` and ``usage_for_queryset``. @@ -104,15 +104,15 @@ class TagManager(models.Manager): SELECT DISTINCT %(tag_columns)s%(count_sql)s FROM %(tag)s - INNER JOIN %(tagged_item)s - ON %(tag)s.id = %(tagged_item)s.tag_id + INNER JOIN %(tagged_item)s AS %(tagged_item_alias)s + ON %(tag)s.id = %(tagged_item_alias)s.tag_id INNER JOIN %(model)s - ON %(tagged_item)s.object_id = %(model_pk)s + ON %(tagged_item_alias)s.object_id = %(model_pk)s %%s - WHERE %(tagged_item)s.content_type_id = %(content_type_id)s + WHERE %(tagged_item_alias)s.content_type_id = %(content_type_id)s %%s %(extra_where)s - GROUP BY %(tag_columns)s, %(tag)s.id, %(tag)s.name + GROUP BY %(tag_columns)s, %(tag)s.id, %(tag)s.name%(extra_tables)s %%s ORDER BY %(tag)s.%(ordering)s ASC""" % { 'tag': qn(self.model._meta.db_table), @@ -120,9 +120,11 @@ class TagManager(models.Manager): 'tag_columns': tag_columns, 'count_sql': counts and (', COUNT(%s)' % model_pk) or '', 'tagged_item': qn(self.intermediary_table_model._meta.db_table), + 'tagged_item_alias': qn('_newtagging_' + self.intermediary_table_model._meta.db_table), 'model': model_table, 'model_pk': model_pk, 'extra_where': extra_where, + 'extra_tables': ''.join((', %s.id' % qn(table)) for table in extra_tables), 'content_type_id': ContentType.objects.get_for_model(model).pk, } @@ -200,11 +202,12 @@ class TagManager(models.Manager): extra_joins = ' '.join(queryset.query.get_from_clause()[0][1:]) where, params = queryset.query.where.as_sql() + extra_tables = queryset.query.extra_tables if where: extra_criteria = 'AND %s' % where else: extra_criteria = '' - return self._get_usage(queryset.model, counts, min_count, extra_joins, extra_criteria, params, extra) + return self._get_usage(queryset.model, counts, min_count, extra_joins, extra_criteria, params, extra, extra_tables=extra_tables) def related_for_model(self, tags, model, counts=False, min_count=None, extra=None): """ -- 2.20.1