Ticket #2859: create_update.diff

django/views/generic/create_update.py

@@ -70 +70 @@
             c[key] = value
     return HttpResponse(t.render(c))
 
-def update_object(request, model, object_id=None, slug=None,
+def update_object(request, model, queryset=None, object_id=None, slug=None,
         slug_field=None, template_name=None, template_loader=loader,
         extra_context=None, post_save_redirect=None,
         login_required=False, follow=None, context_processors=None,
@@ -98 +98 @@
     else:
         raise AttributeError("Generic edit view must be called with either an object_id or a slug/slug_field")
     try:
-        object = model.objects.get(**lookup_kwargs)
+        if queryset:
+            object = queryset.get(**lookup_kwargs)
+        else:
+            object = model.objects.get(**lookup_kwargs)
     except ObjectDoesNotExist:
         raise Http404, "No %s found for %s" % (model._meta.verbose_name, lookup_kwargs)