Django

Code

Ticket #7244: 0001-Fixed-widget-handling-in-ModelChoicesField.__init__.2.patch

File 0001-Fixed-widget-handling-in-ModelChoicesField.__init__.2.patch, 2.2 kB (added by sebastian_noack, 3 months ago)
  • a/django/newforms/models.py

    old new  
    1313from util import ValidationError, ErrorList 
    1414from forms import BaseForm, get_declared_fields 
    1515from fields import Field, ChoiceField, EMPTY_VALUES 
    16 from widgets import Select, SelectMultiple, MultipleHiddenInput 
     16from widgets import SelectMultiple, MultipleHiddenInput 
    1717 
    1818__all__ = ( 
    1919    'ModelForm', 'BaseModelForm', 'model_to_dict', 'fields_for_model', 
     
    301301    } 
    302302 
    303303    def __init__(self, queryset, empty_label=u"---------", cache_choices=False, 
    304                  required=True, widget=Select, label=None, initial=None, 
     304                 required=True, widget=None, label=None, initial=None, 
    305305                 help_text=None, *args, **kwargs): 
    306306        self.empty_label = empty_label 
    307307        self.cache_choices = cache_choices 
     
    360360 
    361361class ModelMultipleChoiceField(ModelChoiceField): 
    362362    """A MultipleChoiceField whose choices are a model QuerySet.""" 
     363    widget = SelectMultiple 
    363364    hidden_widget = MultipleHiddenInput 
    364365    default_error_messages = { 
    365366        'list': _(u'Enter a list of values.'), 
     
    368369    } 
    369370 
    370371    def __init__(self, queryset, cache_choices=False, required=True, 
    371                  widget=SelectMultiple, label=None, initial=None, 
    372                  help_text=None, *args, **kwargs): 
     372                 widget=None, label=None, initial=None, help_text=None, 
     373                 *args, **kwargs): 
    373374        super(ModelMultipleChoiceField, self).__init__(queryset, None, 
    374375            cache_choices, required, widget, label, initial, help_text, 
    375376            *args, **kwargs)