Ticket #3815: subclass_form.2.diff

django/newforms/forms.py

@@ -48 +48 @@
         for base in bases[::-1]:
             if hasattr(base, 'base_fields'):
                 fields = base.base_fields.items() + fields
+        # If this is a model_for_* form, it could also have a base_fields
+        # attribute.
+        if 'base_fields' in attrs and isinstance(attrs['base_fields'], dict):
+            fields += attrs['base_fields'].items()
 
         attrs['base_fields'] = SortedDictFromList(fields)
         return type.__new__(cls, name, bases, attrs)

tests/modeltests/model_forms/models.py

@@ -560 +560 @@
 True
 >>> f.cleaned_data
 {'phone': u'312-555-1212', 'description': u'Assistance'}
+
+# Subclassing using Form ######################################################
+
+>>> CategoryForm = form_for_model(Category, form=Form)
+>>> print CategoryForm().base_fields.keys()
+['name', 'slug', 'url']
+>>> class CategoryWithCommentForm(CategoryForm):
+...     comment = CharField()
+>>> print CategoryWithCommentForm().base_fields.keys()
+['name', 'slug', 'url', 'comment']
 """}