Django

Code

Changeset 8243

Show
Ignore:
Timestamp:
08/08/08 15:27:48 (3 months ago)
Author:
brosner
Message:

Fixed #8069 -- Corrected the inconsistent case with BaseInlineFormset?. It has been renamed to BaseInlineFormSet?. Backward incompatible for anyone who used BaseInlineFormset? directly.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/options.py

    r8240 r8243  
    22from django.forms.formsets import all_valid 
    33from django.forms.models import modelform_factory, inlineformset_factory 
    4 from django.forms.models import BaseInlineFormset 
     4from django.forms.models import BaseInlineFormSet 
    55from django.contrib.contenttypes.models import ContentType 
    66from django.contrib.admin import widgets 
    …… 
    736736    model = None 
    737737    fk_name = None 
    738     formset = BaseInlineFormset 
     738    formset = BaseInlineFormSet 
    739739    extra = 3 
    740740    max_num = 0 

  • django/trunk/django/forms/models.py

    r8179 r8243  
    401401# InlineFormSets ############################################################# 
    402402 
    403 class BaseInlineFormset(BaseModelFormSet): 
     403class BaseInlineFormSet(BaseModelFormSet): 
    404404    """A formset for child objects related to a parent.""" 
    405405    def __init__(self, data=None, files=None, instance=None, 
    …… 
    410410        # is there a better way to get the object descriptor? 
    411411        self.rel_name = RelatedObject(self.fk.rel.to, self.model, self.fk).get_accessor_name() 
    412         super(BaseInlineFormset, self).__init__(data, files, prefix=prefix or self.rel_name) 
     412        super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix or self.rel_name) 
    413413     
    414414    def _construct_forms(self): 
    …… 
    416416            self._total_form_count = self._initial_form_count 
    417417            self._initial_form_count = 0 
    418         super(BaseInlineFormset, self)._construct_forms() 
     418        super(BaseInlineFormSet, self)._construct_forms() 
    419419 
    420420    def get_queryset(self): 
    …… 
    467467 
    468468def inlineformset_factory(parent_model, model, form=ModelForm, 
    469                           formset=BaseInlineFormset, fk_name=None, 
     469                          formset=BaseInlineFormSet, fk_name=None, 
    470470                          fields=None, exclude=None, 
    471471                          extra=3, can_order=False, can_delete=True, max_num=0, 
    472472                          formfield_callback=lambda f: f.formfield()): 
    473473    """ 
    474     Returns an ``InlineFormset`` for the given kwargs. 
     474    Returns an ``InlineFormSet`` for the given kwargs. 
    475475 
    476476    You must provide ``fk_name`` if ``model`` has more than one ``ForeignKey`` 

  • django/trunk/docs/admin.txt

    r8241 r8243  
    609609~~~~~~~~~~~ 
    610610 
    611 This defaults to ``BaseInlineFormset``. Using your own formset can give you 
     611This defaults to ``BaseInlineFormSet``. Using your own formset can give you 
    612612many possibilities of customization. Inlines are built around 
    613613`model formsets`_.