Changeset 6917

Timestamp:

12/12/07 21:14:31 (7 months ago)

Author:

jkocherhans

Message:

Changed ModelForms? to allow inheritance as long as their model attributes are the same.

Files:

• django/trunk/django/newforms/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (2 diffs)

django/trunk/django/newforms/models.py

@@ -246 +246 @@
-        # If a model is defined, extract form fields from it and add them to base_fields
-        if attrs['_meta'].model is not None:
-Meta model if a parent class has.
-Technically the right fields would be generated, but the save 
-
+different Meta model than a
+parent class has. Technically the right fields would be generated,
+but the save 
-            for base in bases:
-                base_opts = getattr(base, '_meta', None)
-                base_model = getattr(base_opts, 'model', None)
-is not None
-more than one model
+and base_model is not opts.model
+a different model than its parent
-            model_fields = fields_for_model(opts.model, opts.fields, opts.exclude)
-            # fields declared in base classes override fields from the model

django/trunk/tests/modeltests/model_forms/models.py

@@ -144 +144 @@
-Traceback (most recent call last):
-...
-more than one model
+a different model than its parent
-
->>> class ArticleForm(ModelForm):
@@ -155 +155 @@
-...
-ImproperlyConfigured: BadForm's base classes define more than one model.
+
+This one is OK since the subclass specifies the same model as the parent.
+
+>>> class SubCategoryForm(CategoryForm):
+...     class Meta:
+...         model = Category
-
-