X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0cae17bec6d31806615fae59a5b3945016285fbe..6280673f35e13e75e81c5b7821bd2a44a1831eab:/apps/newtagging/views.py diff --git a/apps/newtagging/views.py b/apps/newtagging/views.py index 150a08477..867686d3c 100644 --- a/apps/newtagging/views.py +++ b/apps/newtagging/views.py @@ -1,9 +1,10 @@ +# -*- 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, @@ -35,7 +36,7 @@ def tagged_object_list(request, queryset_or_model=None, tag_model=None, tags=Non 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 @@ -43,5 +44,5 @@ def tagged_object_list(request, queryset_or_model=None, tag_model=None, tags=Non 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)