Django

Code

Changeset 7612

Show
Ignore:
Timestamp:
06/10/08 14:58:25 (5 months ago)
Author:
brosner
Message:

newforms-admin: Removed the leading underscore from _formset_factory. It was missed in [7605].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/newforms/formsets.py

    r7603 r7612  
    266266        return mark_safe(u'\n'.join([unicode(self.management_form), forms])) 
    267267 
    268 # XXX: This API *will* change. Use at your own risk. 
    269 def _formset_factory(form, formset=BaseFormSet, extra=1, can_order=False, can_delete=False): 
     268def formset_factory(form, formset=BaseFormSet, extra=1, can_order=False, 
     269                    can_delete=False): 
    270270    """Return a FormSet for the given form class.""" 
    271271    attrs = {'form': form, 'extra': extra, 'can_order': can_order, 'can_delete': can_delete} 

  • django/branches/newforms-admin/django/newforms/models.py

    r7605 r7612  
    1616from widgets import Select, SelectMultiple, HiddenInput, MultipleHiddenInput 
    1717from widgets import media_property 
    18 from formsets import BaseFormSet, _formset_factory, DELETION_FIELD_NAME 
     18from formsets import BaseFormSet, formset_factory, DELETION_FIELD_NAME 
    1919 
    2020__all__ = ( 
    …… 
    378378    form = modelform_factory(model, form=form, fields=fields, exclude=exclude, 
    379379                              formfield_callback=formfield_callback) 
    380     FormSet = _formset_factory(form, formset, extra=extra, can_order=can_order, can_delete=can_delete) 
     380    FormSet = formset_factory(form, formset, extra=extra, can_order=can_order, can_delete=can_delete) 
    381381    FormSet.model = model 
    382382    return FormSet 

  • django/branches/newforms-admin/tests/regressiontests/forms/formsets.py

    r7391 r7612  
    44 
    55FormSet allows us to use multiple instance of the same form on 1 page. For now, 
    6 the best way to create a FormSet is by using the _formset_factory function. 
     6the best way to create a FormSet is by using the formset_factory function. 
    77 
    88>>> from django.newforms import Form, CharField, IntegerField, ValidationError 
    9 >>> from django.newforms.formsets import _formset_factory, BaseFormSet 
     9>>> from django.newforms.formsets import formset_factory, BaseFormSet 
    1010 
    1111>>> class Choice(Form): 
    …… 
    1313...     votes = IntegerField() 
    1414 
    15 >>> ChoiceFormSet = _formset_factory(Choice) 
     15>>> ChoiceFormSet = formset_factory(Choice) 
    1616 
    1717A FormSet constructor takes the same arguments as Form. Let's create a FormSet 
    …… 
    147147 
    148148We can also display more than 1 empty form at a time. To do so, pass a 
    149 extra argument to _formset_factory. 
    150  
    151 >>> ChoiceFormSet = _formset_factory(Choice, extra=3) 
     149extra argument to formset_factory. 
     150 
     151>>> ChoiceFormSet = formset_factory(Choice, extra=3) 
    152152 
    153153>>> formset = ChoiceFormSet(auto_id=False, prefix='choices') 
    …… 
    243243 
    244244We can easily add deletion ability to a FormSet with an agrument to 
    245 _formset_factory. This will add a boolean field to each form instance. When 
     245formset_factory. This will add a boolean field to each form instance. When 
    246246that boolean field is True, the form will be in formset.deleted_forms 
    247247 
    248 >>> ChoiceFormSet = _formset_factory(Choice, can_delete=True) 
     248>>> ChoiceFormSet = formset_factory(Choice, can_delete=True) 
    249249 
    250250>>> initial = [{'choice': u'Calexico', 'votes': 100}, {'choice': u'Fergie', 'votes': 900}] 
    …… 
    291291 
    292292We can also add ordering ability to a FormSet with an agrument to 
    293 _formset_factory. This will add a integer field to each form instance. When 
     293formset_factory. This will add a integer field to each form instance. When 
    294294form validation succeeds, [form.cleaned_data for form in formset.forms] will have the data in the correct 
    295295order specified by the ordering fields. If a number is duplicated in the set 
    …… 
    298298something at the front of the list, you'd need to set it's order to 0. 
    299299 
    300 >>> ChoiceFormSet = _formset_factory(Choice, can_order=True) 
     300>>> ChoiceFormSet = formset_factory(Choice, can_order=True) 
    301301 
    302302>>> initial = [{'choice': u'Calexico', 'votes': 100}, {'choice': u'Fergie', 'votes': 900}] 
    …… 
    372372Let's try throwing ordering and deletion into the same form. 
    373373 
    374 >>> ChoiceFormSet = _formset_factory(Choice, can_order=True, can_delete=True) 
     374>>> ChoiceFormSet = formset_factory(Choice, can_order=True, can_delete=True) 
    375375 
    376376>>> initial = [