Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214

  • django/branches/gis/django/forms/formsets.py

    r7979 r8215  
    33from django.utils.safestring import mark_safe 
    44from fields import IntegerField, BooleanField 
    5 from widgets import Media, HiddenInput, TextInput 
     5from widgets import Media, HiddenInput 
    66from util import ErrorList, ValidationError 
    77 
    …… 
    1111TOTAL_FORM_COUNT = 'TOTAL_FORMS' 
    1212INITIAL_FORM_COUNT = 'INITIAL_FORMS' 
    13 MAX_FORM_COUNT = 'MAX_FORMS' 
    1413ORDERING_FIELD_NAME = 'ORDER' 
    1514DELETION_FIELD_NAME = 'DELETE' 
    …… 
    2423        self.base_fields[TOTAL_FORM_COUNT] = IntegerField(widget=HiddenInput) 
    2524        self.base_fields[INITIAL_FORM_COUNT] = IntegerField(widget=HiddenInput) 
    26         self.base_fields[MAX_FORM_COUNT] = IntegerField(widget=HiddenInput) 
    2725        super(ManagementForm, self).__init__(*args, **kwargs) 
    2826 
    …… 
    4846                self._total_form_count = self.management_form.cleaned_data[TOTAL_FORM_COUNT] 
    4947                self._initial_form_count = self.management_form.cleaned_data[INITIAL_FORM_COUNT] 
    50                 self._max_form_count = self.management_form.cleaned_data[MAX_FORM_COUNT] 
    5148            else: 
    5249                raise ValidationError('ManagementForm data is missing or has been tampered with') 
    …… 
    5451            if initial: 
    5552                self._initial_form_count = len(initial) 
    56                 if self._initial_form_count > self._max_form_count and self._max_form_count > 0: 
    57                     self._initial_form_count = self._max_form_count 
     53                if self._initial_form_count > self.max_num and self.max_num > 0: 
     54                    self._initial_form_count = self.max_num 
    5855                self._total_form_count = self._initial_form_count + self.extra 
    5956            else: 
    6057                self._initial_form_count = 0 
    6158                self._total_form_count = self.extra 
    62             if self._total_form_count > self._max_form_count and self._max_form_count > 0: 
    63                 self._total_form_count = self._max_form_count 
     59            if self._total_form_count > self.max_num and self.max_num > 0: 
     60                self._total_form_count = self.max_num 
    6461            initial = {TOTAL_FORM_COUNT: self._total_form_count, 
    65                        INITIAL_FORM_COUNT: self._initial_form_count, 
    66                        MAX_FORM_COUNT: self._max_form_count} 
     62                       INITIAL_FORM_COUNT: self._initial_form_count} 
    6763            self.management_form = ManagementForm(initial=initial, auto_id=self.auto_id, prefix=self.prefix) 
    6864         
    …… 
    281277    attrs = {'form': form, 'extra': extra, 
    282278             'can_order': can_order, 'can_delete': can_delete, 
    283              '_max_form_count': max_num} 
     279             'max_num': max_num} 
    284280    return type(form.__name__ + 'FormSet', (formset,), attrs) 
    285281