diff options
| author | David Sanders <dsanders11@ucsbalum.com> | 2016-05-13 11:36:41 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-05-13 09:06:20 -0400 |
| commit | 14c952d58167a66645b5e56f7a0ffb6b3bcfbbde (patch) | |
| tree | bca8815094d4bad42e688c7ce3eba032ade64a80 /django | |
| parent | 996cadfa5fbf96062037d1834cc8584fddf655ad (diff) | |
Fixed #26612 -- Fixed SelectFilter2 buttons changing URL.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/static/admin/js/SelectFilter2.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/django/contrib/admin/static/admin/js/SelectFilter2.js b/django/contrib/admin/static/admin/js/SelectFilter2.js index 6eda1faa55..0f9a188d4b 100644 --- a/django/contrib/admin/static/admin/js/SelectFilter2.js +++ b/django/contrib/admin/static/admin/js/SelectFilter2.js @@ -111,16 +111,17 @@ Requires jQuery, core.js, and SelectBox.js. from_box.setAttribute('name', from_box.getAttribute('name') + '_old'); // Set up the JavaScript event handlers for the select box filter interface - var move_selection = function(elem, move_func, from, to) { + var move_selection = function(e, elem, move_func, from, to) { if (elem.className.indexOf('active') !== -1) { move_func(from, to); SelectFilter.refresh_icons(field_id); } + e.preventDefault(); }; - addEvent(choose_all, 'click', function(e) { move_selection(this, SelectBox.move_all, field_id + '_from', field_id + '_to'); }); - addEvent(add_link, 'click', function(e) { move_selection(this, SelectBox.move, field_id + '_from', field_id + '_to'); }); - addEvent(remove_link, 'click', function(e) { move_selection(this, SelectBox.move, field_id + '_to', field_id + '_from'); }); - addEvent(clear_all, 'click', function(e) { move_selection(this, SelectBox.move_all, field_id + '_to', field_id + '_from'); }); + addEvent(choose_all, 'click', function(e) { move_selection(e, this, SelectBox.move_all, field_id + '_from', field_id + '_to'); }); + addEvent(add_link, 'click', function(e) { move_selection(e, this, SelectBox.move, field_id + '_from', field_id + '_to'); }); + addEvent(remove_link, 'click', function(e) { move_selection(e, this, SelectBox.move, field_id + '_to', field_id + '_from'); }); + addEvent(clear_all, 'click', function(e) { move_selection(e, this, SelectBox.move_all, field_id + '_to', field_id + '_from'); }); addEvent(filter_input, 'keypress', function(e) { SelectFilter.filter_key_press(e, field_id); }); addEvent(filter_input, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); }); addEvent(filter_input, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); }); |