mirror of
https://github.com/django/django.git
synced 2025-06-05 03:29:12 +00:00
magic-removal: Updated list_detail generic views to use the new style ORM syntax
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
9661076827
commit
1f174e8d24
@ -58,7 +58,7 @@ def object_list(request, model, paginate_by=None, allow_empty=False,
|
|||||||
'hits' : paginator.hits,
|
'hits' : paginator.hits,
|
||||||
}, context_processors)
|
}, context_processors)
|
||||||
else:
|
else:
|
||||||
object_list = model._default_manager.get_list(**lookup_kwargs)
|
object_list = model._default_manager.filter(**lookup_kwargs)
|
||||||
c = RequestContext(request, {
|
c = RequestContext(request, {
|
||||||
'object_list': object_list,
|
'object_list': object_list,
|
||||||
'is_paginated': False
|
'is_paginated': False
|
||||||
@ -96,7 +96,7 @@ def object_detail(request, model, object_id=None, slug=None,
|
|||||||
raise AttributeError, "Generic detail view must be called with either an object_id or a slug/slug_field."
|
raise AttributeError, "Generic detail view must be called with either an object_id or a slug/slug_field."
|
||||||
lookup_kwargs.update(extra_lookup_kwargs)
|
lookup_kwargs.update(extra_lookup_kwargs)
|
||||||
try:
|
try:
|
||||||
object = model._default_manager.get_object(**lookup_kwargs)
|
object = model._default_manager.get(**lookup_kwargs)
|
||||||
except ObjectDoesNotExist:
|
except ObjectDoesNotExist:
|
||||||
raise Http404, "No %s found for %s" % (model._meta.verbose_name, lookup_kwargs)
|
raise Http404, "No %s found for %s" % (model._meta.verbose_name, lookup_kwargs)
|
||||||
if not template_name:
|
if not template_name:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user