Index: django/forms/widgets.py =================================================================== --- django/forms/widgets.py (Revision 8290) +++ django/forms/widgets.py (Arbeitskopie) @@ -345,7 +345,7 @@ if value is None: value = '' final_attrs = self.build_attrs(attrs, name=name) output = [u'' % flatatt(final_attrs)] - options = self.render_options(choices, [value]) + options, dont_care = self.render_options(choices, [value]) if options: output.append(options) output.append('') @@ -361,15 +361,18 @@ # Normalize to strings. selected_choices = set([force_unicode(v) for v in selected_choices]) output = [] + output_length = 0 for option_value, option_label in chain(self.choices, choices): + output_length += 1 if isinstance(option_label, (list, tuple)): output.append(u'' % escape(force_unicode(option_value))) for option in option_label: + output_length += 1 output.append(render_option(*option)) output.append(u'') else: output.append(render_option(option_value, option_label)) - return u'\n'.join(output) + return u'\n'.join(output), output_length class NullBooleanSelect(Select): """ @@ -398,9 +401,13 @@ class SelectMultiple(Select): def render(self, name, value, attrs=None, choices=()): if value is None: value = [] + options, options_length = self.render_options(choices, value) final_attrs = self.build_attrs(attrs, name=name) + # default size attribute for cross-browser consistent rendering + if 'size' not in final_attrs: + # emulate the behaviour of firefox: adjust the size to the number of choices, with an upper boundary + final_attrs['size'] = min(10, max(1, options_length)) output = [u'') Index: tests/modeltests/model_forms/models.py =================================================================== --- tests/modeltests/model_forms/models.py (Revision 8290) +++ tests/modeltests/model_forms/models.py (Arbeitskopie) @@ -342,7 +342,7 @@ -Categories: @@ -398,7 +398,7 @@ -
  • Categories: @@ -459,7 +459,7 @@
    • -
  • Categories: @@ -575,7 +575,7 @@
    • -
  • Categories: @@ -601,7 +601,7 @@
    • -
  • Categories: Index: tests/regressiontests/admin_widgets/models.py =================================================================== --- tests/regressiontests/admin_widgets/models.py (Revision 8290) +++ tests/regressiontests/admin_widgets/models.py (Arbeitskopie) @@ -41,7 +41,7 @@ >>> w = FilteredSelectMultiple('test', False) >>> print conditional_escape(w.render('test', 'test')) - Index: tests/regressiontests/forms/extra.py =================================================================== --- tests/regressiontests/forms/extra.py (Revision 8290) +++ tests/regressiontests/forms/extra.py (Arbeitskopie) @@ -259,7 +259,7 @@ >>> w = ComplexMultiWidget() >>> print w.render('name', 'some text,JP,2007-04-25 06:24:00') - @@ -300,7 +300,7 @@ >>> f = ComplexFieldForm() >>> print f - @@ -311,7 +311,7 @@ >>> f = ComplexFieldForm({'field1_0':'some text','field1_1':['J','P'], 'field1_2_0':'2007-04-25', 'field1_2_1':'06:24:00'}) >>> print f - Index: tests/regressiontests/forms/forms.py =================================================================== --- tests/regressiontests/forms/forms.py (Revision 8290) +++ tests/regressiontests/forms/forms.py (Arbeitskopie) @@ -476,14 +476,14 @@ ... composers = MultipleChoiceField() >>> f = SongForm(auto_id=False) >>> print f['composers'] - >>> class SongForm(Form): ... name = CharField() ... composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')]) >>> f = SongForm(auto_id=False) >>> print f['composers'] - @@ -491,7 +491,7 @@ >>> print f['name'] >>> print f['composers'] - Index: tests/regressiontests/forms/widgets.py =================================================================== --- tests/regressiontests/forms/widgets.py (Revision 8290) +++ tests/regressiontests/forms/widgets.py (Arbeitskopie) @@ -527,21 +527,21 @@ >>> w = SelectMultiple() >>> print w.render('beatles', ['J'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) - >>> print w.render('beatles', ['J', 'P'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) - >>> print w.render('beatles', ['J', 'P', 'R'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) - @@ -550,7 +550,7 @@ If the value is None, none of the options are selected: >>> print w.render('beatles', None, choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) - @@ -559,7 +559,7 @@ If the value corresponds to a label (but not to an option value), none of the options are selected: >>> print w.render('beatles', ['John'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) - @@ -568,7 +568,7 @@ If multiple values are given, but some of them are not valid, the valid ones are selected: >>> print w.render('beatles', ['J', 'G', 'foo'], choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo'))) - @@ -577,19 +577,19 @@ The value is compared to its str(): >>> print w.render('nums', [2], choices=[('1', '1'), ('2', '2'), ('3', '3')]) - >>> print w.render('nums', ['2'], choices=[(1, 1), (2, 2), (3, 3)]) - >>> print w.render('nums', [2], choices=[(1, 1), (2, 2), (3, 3)]) - @@ -600,7 +600,7 @@ ... for i in range(5): ... yield (i, i) >>> print w.render('nums', [2], choices=get_choices()) - @@ -611,7 +611,7 @@ You can also pass 'choices' to the constructor: >>> w = SelectMultiple(choices=[(1, 1), (2, 2), (3, 3)]) >>> print w.render('nums', [2]) - @@ -619,7 +619,7 @@ If 'choices' is passed to both the constructor and render(), then they'll both be in the output: >>> print w.render('nums', [2], choices=[(4, 4), (5, 5)]) - @@ -629,7 +629,7 @@ # Choices are escaped correctly >>> print w.render('escape', None, choices=(('bad', 'you & me'), ('good', mark_safe('you > me')))) - @@ -639,7 +639,7 @@ # Unicode choices are correctly rendered as HTML >>> w.render('nums', ['ŠĐĆŽćžšđ'], choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')]) -u'' +u'' # Test the usage of _has_changed >>> w._has_changed(None, None) @@ -658,7 +658,7 @@ # Choices can be nested one level in order to create HTML optgroups: >>> w.choices = (('outer1', 'Outer 1'), ('Group "1"', (('inner1', 'Inner 1'), ('inner2', 'Inner 2')))) >>> print w.render('nestchoice', None) - @@ -667,7 +667,7 @@ >>> print w.render('nestchoice', ['outer1']) - @@ -676,7 +676,7 @@ >>> print w.render('nestchoice', ['inner1']) - @@ -685,7 +685,7 @@ >>> print w.render('nestchoice', ['outer1', 'inner2']) -