+# -*- coding: utf-8 -*-
"""
Tagging related views.
"""
from django.http import Http404
from django.utils.translation import ugettext as _
-from django.views.generic.list_detail import object_list
+from django.views.generic import ListView
def tagged_object_list(request, queryset_or_model=None, tag_model=None, tags=None,
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)
+ queryset = tag_model.intermediary_table_model.objects.get_by_model(queryset_or_model, tag_instances)
if not kwargs.has_key('extra_context'):
kwargs['extra_context'] = {}
kwargs['extra_context']['tags'] = tag_instances
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)
+ return ListView.as_view(queryset=queryset)(request, **kwargs)