Fixed #11843 - Give MultipleHiddenInput different IDs. Thanks Chris Beaven.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
18723e6e24
commit
341c85bed0
|
@ -242,9 +242,16 @@ class MultipleHiddenInput(HiddenInput):
|
||||||
def render(self, name, value, attrs=None, choices=()):
|
def render(self, name, value, attrs=None, choices=()):
|
||||||
if value is None: value = []
|
if value is None: value = []
|
||||||
final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
|
final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
|
||||||
return mark_safe(u'\n'.join([(u'<input%s />' %
|
id_ = final_attrs.get('id', None)
|
||||||
flatatt(dict(value=force_unicode(v), **final_attrs)))
|
inputs = []
|
||||||
for v in value]))
|
for i, v in enumerate(value):
|
||||||
|
input_attrs = dict(value=force_unicode(v), **final_attrs)
|
||||||
|
if id_:
|
||||||
|
# An ID attribute was given. Add a numeric index as a suffix
|
||||||
|
# so that the inputs don't all have the same ID attribute.
|
||||||
|
input_attrs['id'] = '%s_%s' % (id_, i)
|
||||||
|
inputs.append(u'<input%s />' % flatatt(input_attrs))
|
||||||
|
return mark_safe(u'\n'.join(inputs))
|
||||||
|
|
||||||
def value_from_datadict(self, data, files, name):
|
def value_from_datadict(self, data, files, name):
|
||||||
if isinstance(data, (MultiValueDict, MergeDict)):
|
if isinstance(data, (MultiValueDict, MergeDict)):
|
||||||
|
|
|
@ -183,6 +183,11 @@ u'<input type="hidden" class="fun" value="\u0160\u0110\u0106\u017d\u0107\u017e\u
|
||||||
>>> w.render('email', ['foo@example.com'], attrs={'class': 'special'})
|
>>> w.render('email', ['foo@example.com'], attrs={'class': 'special'})
|
||||||
u'<input type="hidden" class="special" value="foo@example.com" name="email" />'
|
u'<input type="hidden" class="special" value="foo@example.com" name="email" />'
|
||||||
|
|
||||||
|
Each input gets a separate ID.
|
||||||
|
>>> w = MultipleHiddenInput()
|
||||||
|
>>> w.render('letters', list('abc'), attrs={'id': 'hideme'})
|
||||||
|
u'<input type="hidden" name="letters" value="a" id="hideme_0" />\n<input type="hidden" name="letters" value="b" id="hideme_1" />\n<input type="hidden" name="letters" value="c" id="hideme_2" />'
|
||||||
|
|
||||||
# FileInput Widget ############################################################
|
# FileInput Widget ############################################################
|
||||||
|
|
||||||
FileInput widgets don't ever show the value, because the old value is of no use
|
FileInput widgets don't ever show the value, because the old value is of no use
|
||||||
|
@ -1016,6 +1021,14 @@ True
|
||||||
>>> w.render('nums', ['ŠĐĆŽćžšđ'], choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')])
|
>>> w.render('nums', ['ŠĐĆŽćžšđ'], choices=[('ŠĐĆŽćžšđ', 'ŠĐabcĆŽćžšđ'), ('ćžšđ', 'abcćžšđ')])
|
||||||
u'<ul>\n<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>\n<li><label><input type="checkbox" name="nums" value="2" /> 2</label></li>\n<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>\n<li><label><input checked="checked" type="checkbox" name="nums" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" /> \u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</label></li>\n<li><label><input type="checkbox" name="nums" value="\u0107\u017e\u0161\u0111" /> abc\u0107\u017e\u0161\u0111</label></li>\n</ul>'
|
u'<ul>\n<li><label><input type="checkbox" name="nums" value="1" /> 1</label></li>\n<li><label><input type="checkbox" name="nums" value="2" /> 2</label></li>\n<li><label><input type="checkbox" name="nums" value="3" /> 3</label></li>\n<li><label><input checked="checked" type="checkbox" name="nums" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" /> \u0160\u0110abc\u0106\u017d\u0107\u017e\u0161\u0111</label></li>\n<li><label><input type="checkbox" name="nums" value="\u0107\u017e\u0161\u0111" /> abc\u0107\u017e\u0161\u0111</label></li>\n</ul>'
|
||||||
|
|
||||||
|
# Each input gets a separate ID
|
||||||
|
>>> print CheckboxSelectMultiple().render('letters', list('ac'), choices=zip(list('abc'), list('ABC')), attrs={'id': 'abc'})
|
||||||
|
<ul>
|
||||||
|
<li><label for="abc_0"><input checked="checked" type="checkbox" name="letters" value="a" id="abc_0" /> A</label></li>
|
||||||
|
<li><label for="abc_1"><input type="checkbox" name="letters" value="b" id="abc_1" /> B</label></li>
|
||||||
|
<li><label for="abc_2"><input checked="checked" type="checkbox" name="letters" value="c" id="abc_2" /> C</label></li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
# MultiWidget #################################################################
|
# MultiWidget #################################################################
|
||||||
|
|
||||||
>>> class MyMultiWidget(MultiWidget):
|
>>> class MyMultiWidget(MultiWidget):
|
||||||
|
|
Loading…
Reference in New Issue