Django

Code

Changeset 7942

Show
Ignore:
Timestamp:
07/17/08 11:11:49 (4 months ago)
Author:
brosner
Message:

newforms-admin: Fixed #7794 -- Allow BaseModelFormSet? classes to work as an inline formset. This just loosens the validator checks. Thanks paltman for the report.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin/django/contrib/admin/validation.py

    r7932 r7942  
    22from django.core.exceptions import ImproperlyConfigured 
    33from django.db import models 
    4 from django.newforms.models import BaseModelForm, BaseInlineFormset 
     4from django.newforms.models import BaseModelForm, BaseModelFormSet 
    55from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin 
    66from django.contrib.admin.options import HORIZONTAL, VERTICAL 
     
    130130 
    131131    # formset 
    132     if hasattr(cls, 'formset') and not issubclass(cls.formset, BaseInlineFormset): 
     132    if hasattr(cls, 'formset') and not issubclass(cls.formset, BaseModelFormSet): 
    133133        raise ImproperlyConfigured("`%s.formset` does not inherit from " 
    134                 "BaseInlineFormset." % cls.__name__) 
     134                "BaseModelFormSet." % cls.__name__) 
    135135 
    136136def _validate_base(cls, model): 
  • django/branches/newforms-admin/tests/regressiontests/modeladmin/models.py

    r7932 r7942  
    798798# formset 
    799799 
     800>>> from django.newforms.models import BaseModelFormSet 
     801 
    800802>>> class FakeFormSet(object): 
    801803...     pass 
     
    808810Traceback (most recent call last): 
    809811... 
    810 ImproperlyConfigured: `ValidationTestInline.formset` does not inherit from BaseInlineFormset. 
     812ImproperlyConfigured: `ValidationTestInline.formset` does not inherit from BaseModelFormSet. 
     813 
     814>>> class RealModelFormSet(BaseModelFormSet): 
     815...     pass 
     816>>> class ValidationTestInline(TabularInline): 
     817...     model = ValidationTestInlineModel 
     818...     formset = RealModelFormSet 
     819>>> class ValidationTestModelAdmin(ModelAdmin): 
     820...     inlines = [ValidationTestInline] 
     821>>> validate(ValidationTestModelAdmin, ValidationTestModel) 
    811822 
    812823"""