X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e0de41ae1e67c230ad1e67f34f6f4f76e53d7234..5b9ee3437b7fa98820eba7286abd524c3ede76e9:/apps/newtagging/views.py diff --git a/apps/newtagging/views.py b/apps/newtagging/views.py index b88e9c42d..867686d3c 100644 --- a/apps/newtagging/views.py +++ b/apps/newtagging/views.py @@ -4,7 +4,7 @@ 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, @@ -36,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 @@ -44,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)