Ticket #15125: introspec_meta.2.diff

django/views/generic/edit.py

@@ -86 +86 @@
         kwargs.update({'instance': self.object})
         return kwargs
 
+    def get_queryset(self):
+        """
+        Get the queryset to look an object up against. May not be called if
+        `get_object` is overridden.
+        """
+        if self.queryset is None:
+            if self.form_class:
+                return self.form_class._meta.model._default_manager.all()
+            else:
+                return super(ModelFormMixin, self).get_queryset()
+
     def get_success_url(self):
         if self.success_url:
             url = self.success_url % self.object.__dict__

tests/regressiontests/generic_views/edit.py

@@ -201 +201 @@
         except ImproperlyConfigured:
             pass
 
+    def test_update_with_form_class(self):
+        a = Author.objects.create(
+            name='Randall Munroe',
+            slug='randall-munroe',
+        )
+        res = self.client.post('/edit/author/%d/update/formclass/' % a.pk,
+                        {'name': 'Randall Munroe (author of xkcd)', 'slug': 'randall-munroe'})
+        self.assertEqual(res.status_code, 302)
+        self.assertRedirects(res, 'http://testserver/edit/authors/create/')
+        self.assertQuerysetEqual(Author.objects.all(), ['<Author: Randall Munroe (author of xkcd)>'])
+
 class DeleteViewTests(TestCase):
     urls = 'regressiontests.generic_views.urls'
 

tests/regressiontests/generic_views/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
-from django.views.generic import TemplateView
+from django.views.generic import TemplateView, UpdateView
+from regressiontests.generic_views.forms import AuthorForm
 
 import views
 
@@ -64 +65 @@
         views.NaiveAuthorUpdate.as_view()),
     (r'^edit/author/(?P<pk>\d+)/update/redirect/$',
         views.NaiveAuthorUpdate.as_view(success_url='/edit/authors/create/')),
+    (r'^edit/author/(?P<pk>\d+)/update/formclass/$',
+        UpdateView.as_view(form_class=AuthorForm, 
+            success_url='/edit/authors/create/')),
     (r'^edit/author/(?P<pk>\d+)/update/interpolate_redirect/$',
         views.NaiveAuthorUpdate.as_view(success_url='/edit/author/%(id)d/update/')),
     (r'^edit/author/(?P<pk>\d+)/update/$',