Author: brosner
Date: 2008-07-17 11:11:49 -0500 (Thu, 17 Jul 2008)
New Revision: 7942
Modified:
django/branches/newforms-admin/django/contrib/admin/validation.py
django/branches/newforms-admin/tests/regressiontests/modeladmin/models.py
Log:
newforms-admin: Fixed #7794 -- Allow BaseModelFormSet classes to work as an
inline formset. This just loosens the validator checks. Thanks paltman for the
report.
Modified: django/branches/newforms-admin/django/contrib/admin/validation.py
===================================================================
--- django/branches/newforms-admin/django/contrib/admin/validation.py
2008-07-17 13:29:35 UTC (rev 7941)
+++ django/branches/newforms-admin/django/contrib/admin/validation.py
2008-07-17 16:11:49 UTC (rev 7942)
@@ -1,7 +1,7 @@
from django.core.exceptions import ImproperlyConfigured
from django.db import models
-from django.newforms.models import BaseModelForm, BaseInlineFormset
+from django.newforms.models import BaseModelForm, BaseModelFormSet
from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin
from django.contrib.admin.options import HORIZONTAL, VERTICAL
@@ -129,9 +129,9 @@
% (cls.__name__, attr))
# formset
- if hasattr(cls, 'formset') and not issubclass(cls.formset,
BaseInlineFormset):
+ if hasattr(cls, 'formset') and not issubclass(cls.formset,
BaseModelFormSet):
raise ImproperlyConfigured("`%s.formset` does not inherit from "
- "BaseInlineFormset." % cls.__name__)
+ "BaseModelFormSet." % cls.__name__)
def _validate_base(cls, model):
opts = model._meta
Modified:
django/branches/newforms-admin/tests/regressiontests/modeladmin/models.py
===================================================================
--- django/branches/newforms-admin/tests/regressiontests/modeladmin/models.py
2008-07-17 13:29:35 UTC (rev 7941)
+++ django/branches/newforms-admin/tests/regressiontests/modeladmin/models.py
2008-07-17 16:11:49 UTC (rev 7942)
@@ -797,6 +797,8 @@
# formset
+>>> from django.newforms.models import BaseModelFormSet
+
>>> class FakeFormSet(object):
... pass
>>> class ValidationTestInline(TabularInline):
@@ -807,7 +809,16 @@
>>> validate(ValidationTestModelAdmin, ValidationTestModel)
Traceback (most recent call last):
...
-ImproperlyConfigured: `ValidationTestInline.formset` does not inherit from
BaseInlineFormset.
+ImproperlyConfigured: `ValidationTestInline.formset` does not inherit from
BaseModelFormSet.
+>>> class RealModelFormSet(BaseModelFormSet):
+... pass
+>>> class ValidationTestInline(TabularInline):
+... model = ValidationTestInlineModel
+... formset = RealModelFormSet
+>>> class ValidationTestModelAdmin(ModelAdmin):
+... inlines = [ValidationTestInline]
+>>> validate(ValidationTestModelAdmin, ValidationTestModel)
+
"""
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
