Django

Code

Changeset 8774

Show
Ignore:
Timestamp:
08/31/08 15:30:55 (4 months ago)
Author:
jacob
Message:

Fixed #8194 (again): correctly focus on the first declared field in the admin. Thanks to fredbartle for catching my silly mistake the first time 'round.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r8756 r8774  
    2121 
    2222    def first_field(self): 
    23         if self.form._meta.fields is not None: 
    24             name = self.form._meta.fields[0] 
    25             return forms.BoundField(self.form, self.form.fields[name], name) 
     23        try: 
     24            fieldset_name, fieldset_options = self.fieldsets[0] 
     25            field_name = fieldset_options['fields'][0] 
     26            if not isinstance(field_name, basestring): 
     27                field_name = field_name[0] 
     28            return self.form[field_name] 
     29        except (KeyError, IndexError): 
     30            pass 
    2631        try: 
    2732            return iter(self.form).next()