Django

Code

Changeset 4417

Show
Ignore:
Timestamp:
01/24/07 11:58:20 (2 years ago)
Author:
adrian
Message:

newforms-admin: Fixed a bug in formfield_for_dbfield()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/contrib/admin/options.py

    r4416 r4417  
    206206        # For filter_interface ManyToManyFields, use a special Widget. 
    207207        if isinstance(db_field, models.ManyToManyField) and db_field.rel.filter_interface: 
    208             widget = widgets.FilteredSelectMultiple(db_field.verbose_name, db_field.rel.filter_interface-1) 
    209             return db_field.formfield(widget=widget, **kwargs) 
     208            kwargs['widget'] = widgets.FilteredSelectMultiple(db_field.verbose_name, db_field.rel.filter_interface-1) 
     209            return db_field.formfield(**kwargs) 
    210210 
    211211        # For DateTimeFields, use a special field and widget. 
    …… 
    216216        # For DateFields, add a custom CSS class. 
    217217        if isinstance(db_field, models.DateField): 
    218             return db_field.formfield(widget=forms.TextInput(attrs={'class': 'vDateField', 'size': '10'})) 
     218            kwargs['widget'] = forms.TextInput(attrs={'class': 'vDateField', 'size': '10'}) 
     219            return db_field.formfield(**kwargs) 
    219220 
    220221        # For TimeFields, add a custom CSS class. 
    221222        if isinstance(db_field, models.TimeField): 
    222             return db_field.formfield(widget=forms.TextInput(attrs={'class': 'vTimeField', 'size': '8'})) 
     223            kwargs['widget'] = forms.TextInput(attrs={'class': 'vTimeField', 'size': '8'}) 
     224            return db_field.formfield(**kwargs) 
    223225 
    224226        # For ForeignKey or ManyToManyFields, use a special widget. 
    …… 
    226228            # Wrap the widget's render() method with a method that adds 
    227229            # extra HTML to the end of the rendered output. 
    228             formfield = db_field.formfield() 
     230            formfield = db_field.formfield(**kwargs) 
    229231            formfield.widget.render = widgets.RelatedFieldWidgetWrapper(formfield.widget.render, db_field.rel) 
    230232            return formfield