p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #31404 -- Changed selector-chosen's multiple attribute to HTML5 boolean syntax.

This commit is contained in:
zriv 2020-03-26 09:53:39 +00:00 committed by Mariusz Felisiak
parent bec4dea844
commit b9336b78cf
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -954,6 +954,7 @@ answer newbie questions, and generally made Django that much better:
zegor zegor
Zeynel Özdemir <ozdemir.zynl@gmail.com> Zeynel Özdemir <ozdemir.zynl@gmail.com>
Zlatko Mašek <zlatko.masek@gmail.com> Zlatko Mašek <zlatko.masek@gmail.com>
zriv <https://github.com/zriv>
<Please alphabetize new entries> <Please alphabetize new entries>
A big THANK YOU goes to: A big THANK YOU goes to:

2
django/contrib/admin/static/admin/js/SelectFilter2.js
View File

@ -95,7 +95,7 @@ Requires core.js and SelectBox.js.
) )
); );
var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.name); var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', '', 'size', from_box.size, 'name', from_box.name);
to_box.className = 'filtered'; to_box.className = 'filtered';
var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_remove_all_link'); var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_remove_all_link');
clear_all.className = 'selector-clearall'; clear_all.className = 'selector-clearall';

1
js_tests/admin/SelectFilter2.test.js
View File

@ -15,6 +15,7 @@ QUnit.test('init', function(assert) {
$('.selector-available select').outerHeight() + $('.selector-filter').outerHeight(), $('.selector-available select').outerHeight() + $('.selector-filter').outerHeight(),
$('.selector-chosen select').height() $('.selector-chosen select').height()
); );
assert.equal($('.selector-chosen select')[0].getAttribute('multiple'), '');
assert.equal($('.selector-chooseall').text(), "Choose all"); assert.equal($('.selector-chooseall').text(), "Choose all");
assert.equal($('.selector-add').text(), "Choose"); assert.equal($('.selector-add').text(), "Choose");
assert.equal($('.selector-remove').text(), "Remove"); assert.equal($('.selector-remove').text(), "Remove");