diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-02-01 14:14:56 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-02-01 14:14:56 +0000 |
| commit | 9555f2be9dc7c5cc1aeb3f4a047550ccd9b0cb2c (patch) | |
| tree | 52de3832306a6f3689be00c9f2f8fa0b7b22b2b1 /django/forms | |
| parent | f70a0882a3d916cfd59c31d6a6f4316dce104466 (diff) | |
Fixed #12692 - Properly handle the extra clause of admin inline formsets. Also fixes #12703, second error.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms')
| -rw-r--r-- | django/forms/formsets.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/forms/formsets.py b/django/forms/formsets.py index a86c18f138..58af0ac23b 100644 --- a/django/forms/formsets.py +++ b/django/forms/formsets.py @@ -12,6 +12,7 @@ __all__ = ('BaseFormSet', 'all_valid') # special field names TOTAL_FORM_COUNT = 'TOTAL_FORMS' INITIAL_FORM_COUNT = 'INITIAL_FORMS' +MAX_NUM_FORM_COUNT = 'MAX_NUM_FORMS' ORDERING_FIELD_NAME = 'ORDER' DELETION_FIELD_NAME = 'DELETE' @@ -24,6 +25,7 @@ class ManagementForm(Form): def __init__(self, *args, **kwargs): self.base_fields[TOTAL_FORM_COUNT] = IntegerField(widget=HiddenInput) self.base_fields[INITIAL_FORM_COUNT] = IntegerField(widget=HiddenInput) + self.base_fields[MAX_NUM_FORM_COUNT] = IntegerField(widget=HiddenInput) super(ManagementForm, self).__init__(*args, **kwargs) class BaseFormSet(StrAndUnicode): @@ -56,7 +58,8 @@ class BaseFormSet(StrAndUnicode): else: form = ManagementForm(auto_id=self.auto_id, prefix=self.prefix, initial={ TOTAL_FORM_COUNT: self.total_form_count(), - INITIAL_FORM_COUNT: self.initial_form_count() + INITIAL_FORM_COUNT: self.initial_form_count(), + MAX_NUM_FORM_COUNT: self.max_num }) return form management_form = property(_management_form) |