Ticket #17557: improve-cbv-104.patch

django/views/generic/edit.py

@@ -27 +27 @@
         """
         return self.form_class
 
-    def get_form(self, form_class):
+    def get_form(self, form_class=None):
         """
         Returns an instance of the form to be used in this view.
+
+        The form class defaults to ``get_form_class`` if no ``form_class``
+        argument is provided.
         """
+        if not form_class:
+            form_class = self.get_form_class()
         return form_class(**self.get_form_kwargs())
 
     def get_form_kwargs(self):

tests/regressiontests/generic_views/edit.py

@@ -4 +4 @@
 from django.core.urlresolvers import reverse
 from django import forms
 from django.test import TestCase
+from django.test.client import RequestFactory
 from django.utils.unittest import expectedFailure
 
 from . import views
 from .models import Artist, Author
 
 
+class FormMixinTestCase(TestCase):
+    def setUp(self):
+        self.factory = RequestFactory()
+
+    def get_mixin(self):
+        mixin = views.ExpandedAuthorFormMixin()
+        mixin.request = self.factory.get("/any/url/works")
+        return mixin
+
+    def test_get_form_without_form_class(self):
+        form = self.get_mixin().get_form()
+        self.assertEqual(form.__class__, views.ExpandedAuthorForm)
+
+    def test_get_form_with_form_class(self):
+        form = self.get_mixin().get_form(views.AuthorForm)
+        self.assertEqual(form.__class__, views.AuthorForm)
+
+
 class ModelFormMixinTests(TestCase):
     def test_get_form(self):
         form_class = views.AuthorGetQuerySetFormView().get_form_class()

tests/regressiontests/generic_views/forms.py

@@ -11 +11 @@
 
     class Meta:
         model = Author
+
+
+class ExpandedAuthorForm(forms.ModelForm):
+    name = forms.CharField()
+    slug = forms.SlugField()
+    extra = forms.CharField()
+
+    class Meta:
+        model = Author

tests/regressiontests/generic_views/tests.py

@@ -6 +6 @@
     DateDetailViewTests)
 from .detail import DetailViewTest
 from .edit import (ModelFormMixinTests, CreateViewTests, UpdateViewTests,
-    DeleteViewTests)
+    DeleteViewTests, FormMixinTestCase)
 from .list import ListViewTests

tests/regressiontests/generic_views/views.py

@@ -5 +5 @@
 from django.core.urlresolvers import reverse
 from django.utils.decorators import method_decorator
 from django.views import generic
+from django.views.generic.edit import FormMixin
 
-from .forms import AuthorForm
+from .forms import AuthorForm, ExpandedAuthorForm
 from .models import Artist, Author, Book, Page
 
 
@@ -89 +90 @@
     success_url = '/list/authors/'
 
 
+class ExpandedAuthorFormMixin(FormMixin):
+    form_class = ExpandedAuthorForm
+
+
 class SpecializedAuthorCreate(generic.CreateView):
     model = Author
     form_class = AuthorForm

django/views/generic/edit.py

@@ -132 +132 @@
     A mixin that processes a form on POST.
     """
     def get(self, request, *args, **kwargs):
-        form_class = self.get_form_class()
-        form = self.get_form(form_class)
+        form = self.get_form()
         return self.render_to_response(self.get_context_data(form=form))
 
     def post(self, request, *args, **kwargs):
-        form_class = self.get_form_class()
-        form = self.get_form(form_class)
+        form = self.get_form()
         if form.is_valid():
             return self.form_valid(form)
         else:

django/views/generic/edit.py

@@ -51 +51 @@
         return kwargs
 
     def get_context_data(self, **kwargs):
+        if not "form" in kwargs:
+            kwargs["form"] = self.get_form()
         return kwargs
 
     def get_success_url(self):

tests/regressiontests/generic_views/edit.py

@@ -28 +28 @@
         form = self.get_mixin().get_form(views.AuthorForm)
         self.assertEqual(form.__class__, views.AuthorForm)
 
+    def test_get_context_data_without_form(self):
+        context_data = self.get_mixin().get_context_data()
+        self.assertTrue("form" in context_data)
+        self.assertEqual(context_data["form"].__class__,
+                views.ExpandedAuthorForm)
+
+    def test_get_context_data_with_form(self):
+        context_data = self.get_mixin().get_context_data(
+                form=views.AuthorForm())
+        self.assertEqual(context_data["form"].__class__, views.AuthorForm)
+
 
 class ModelFormMixinTests(TestCase):
     def test_get_form(self):

django/views/generic/edit.py

@@ -120 +120 @@
         return super(ModelFormMixin, self).form_valid(form)
 
     def get_context_data(self, **kwargs):
-        context = kwargs
+        context = super(ModelFormMixin, self).get_context_data(**kwargs)
         if self.object:
             context['object'] = self.object
             context_object_name = self.get_context_object_name(self.object)
@@ -134 +134 @@
     A mixin that processes a form on POST.
     """
     def get(self, request, *args, **kwargs):
-        form = self.get_form()
-        return self.render_to_response(self.get_context_data(form=form))
+        return self.render_to_response(self.get_context_data())
 
     def post(self, request, *args, **kwargs):
         form = self.get_form()

tests/regressiontests/generic_views/edit.py

@@ -41 +41 @@
 
 
 class ModelFormMixinTests(TestCase):
+    def get_testable_view(self):
+        view = views.AuthorGetQuerySetFormView()
+        view.request = RequestFactory().get("/any/url/works")
+        view.object = None
+        return view
+
     def test_get_form(self):
         form_class = views.AuthorGetQuerySetFormView().get_form_class()
         self.assertEqual(form_class._meta.model, Author)
 
+    def test_get_context_data_adds_form_if_not_present(self):
+        view = self.get_testable_view()
+        context_data = view.get_context_data()
+        self.assertTrue("form" in context_data)
+        self.assertEqual(context_data["form"]._meta.model, Author)
+
+
 class CreateViewTests(TestCase):
     urls = 'regressiontests.generic_views.urls'