summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzriv <zriv@users.noreply.github.com>2020-03-26 09:53:39 +0000
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-03-27 08:38:58 +0100
commitb9336b78cf2a9a29f4934041c9e221bc68daec80 (patch)
tree1359cea658d31b00632f819b319ae337d0e13cd6
parentbec4dea844332390aecd72f22afc6673a3f5f5fc (diff)
Fixed #31404 -- Changed selector-chosen's multiple attribute to HTML5 boolean syntax.
-rw-r--r--AUTHORS1
-rw-r--r--django/contrib/admin/static/admin/js/SelectFilter2.js2
-rw-r--r--js_tests/admin/SelectFilter2.test.js1
3 files changed, 3 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 8e33fc0240..69a56718d8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -954,6 +954,7 @@ answer newbie questions, and generally made Django that much better:
zegor
Zeynel Özdemir <ozdemir.zynl@gmail.com>
Zlatko Mašek <zlatko.masek@gmail.com>
+ zriv <https://github.com/zriv>
<Please alphabetize new entries>
A big THANK YOU goes to:
diff --git a/django/contrib/admin/static/admin/js/SelectFilter2.js b/django/contrib/admin/static/admin/js/SelectFilter2.js
index 8ea9bc3e47..b4f5c06803 100644
--- a/django/contrib/admin/static/admin/js/SelectFilter2.js
+++ b/django/contrib/admin/static/admin/js/SelectFilter2.js
@@ -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';
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';
diff --git a/js_tests/admin/SelectFilter2.test.js b/js_tests/admin/SelectFilter2.test.js
index 79b61c58ae..fd0f309a04 100644
--- a/js_tests/admin/SelectFilter2.test.js
+++ b/js_tests/admin/SelectFilter2.test.js
@@ -15,6 +15,7 @@ QUnit.test('init', function(assert) {
$('.selector-available select').outerHeight() + $('.selector-filter').outerHeight(),
$('.selector-chosen select').height()
);
+ assert.equal($('.selector-chosen select')[0].getAttribute('multiple'), '');
assert.equal($('.selector-chooseall').text(), "Choose all");
assert.equal($('.selector-add').text(), "Choose");
assert.equal($('.selector-remove').text(), "Remove");