mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Removed 'extra_lookup_kwargs' parameter from create_update generic views

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-05-01 03:22:27 +00:00
parent a8572b18a9
commit b3ca785986
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/views/generic/create_update.py
View File

@ -71,7 +71,7 @@ def create_object(request, model, template_name=None,
def update_object(request, model, object_id=None, slug=None, def update_object(request, model, object_id=None, slug=None,
slug_field=None, template_name=None, template_loader=loader, slug_field=None, template_name=None, template_loader=loader,
extra_lookup_kwargs={}, extra_context={}, post_save_redirect=None, extra_context={}, post_save_redirect=None,
login_required=False, follow=None, context_processors=None, login_required=False, follow=None, context_processors=None,
template_object_name='object'): template_object_name='object'):
""" """
@ -95,7 +95,6 @@ def update_object(request, model, object_id=None, slug=None,
lookup_kwargs['%s__exact' % slug_field] = slug lookup_kwargs['%s__exact' % slug_field] = slug
else: else:
raise AttributeError("Generic edit view must be called with either an object_id or a slug/slug_field") raise AttributeError("Generic edit view must be called with either an object_id or a slug/slug_field")
lookup_kwargs.update(extra_lookup_kwargs)
try: try:
object = model.objects.get(**lookup_kwargs) object = model.objects.get(**lookup_kwargs)
except ObjectDoesNotExist: except ObjectDoesNotExist:
@ -144,7 +143,7 @@ def update_object(request, model, object_id=None, slug=None,
def delete_object(request, model, post_delete_redirect, def delete_object(request, model, post_delete_redirect,
object_id=None, slug=None, slug_field=None, template_name=None, object_id=None, slug=None, slug_field=None, template_name=None,
template_loader=loader, extra_lookup_kwargs={}, extra_context={}, template_loader=loader, extra_context={},
login_required=False, context_processors=None, template_object_name='object'): login_required=False, context_processors=None, template_object_name='object'):
""" """
Generic object-delete function. Generic object-delete function.
@ -169,7 +168,6 @@ def delete_object(request, model, post_delete_redirect,
lookup_kwargs['%s__exact' % slug_field] = slug lookup_kwargs['%s__exact' % slug_field] = slug
else: else:
raise AttributeError("Generic delete view must be called with either an object_id or a slug/slug_field") raise AttributeError("Generic delete view must be called with either an object_id or a slug/slug_field")
lookup_kwargs.update(extra_lookup_kwargs)
try: try:
object = model._default_manager.get(**lookup_kwargs) object = model._default_manager.get(**lookup_kwargs)
except ObjectDoesNotExist: except ObjectDoesNotExist: