diff options
| author | David Sanders <dsanders11@ucsbalum.com> | 2016-05-03 10:09:07 -0700 |
|---|---|---|
| committer | Simon Charette <charettes@users.noreply.github.com> | 2016-05-03 13:09:07 -0400 |
| commit | e00d77c4834b40f06f9bf271da5fdfb526ad8f56 (patch) | |
| tree | 8d5c22f362ffe9a541724d3742982b373a3c16d1 /django | |
| parent | c9c5ccbd413332aafb45c47749fb6e8ede70eef4 (diff) | |
Fixed #26575 -- Disabled SelectFilter buttons when inactive.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/static/admin/js/SelectFilter2.js | 14 | ||||
| -rw-r--r-- | django/contrib/admin/tests.py | 12 |
2 files changed, 22 insertions, 4 deletions
diff --git a/django/contrib/admin/static/admin/js/SelectFilter2.js b/django/contrib/admin/static/admin/js/SelectFilter2.js index 19c16a704a..6eda1faa55 100644 --- a/django/contrib/admin/static/admin/js/SelectFilter2.js +++ b/django/contrib/admin/static/admin/js/SelectFilter2.js @@ -111,10 +111,16 @@ 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 - addEvent(choose_all, 'click', function() { SelectBox.move_all(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); }); - addEvent(add_link, 'click', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); }); - addEvent(remove_link, 'click', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); }); - addEvent(clear_all, 'click', function() { SelectBox.move_all(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); }); + var move_selection = function(elem, move_func, from, to) { + if (elem.className.indexOf('active') !== -1) { + move_func(from, to); + SelectFilter.refresh_icons(field_id); + } + }; + 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(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); }); diff --git a/django/contrib/admin/tests.py b/django/contrib/admin/tests.py index 20292c5dc3..c46cc82acc 100644 --- a/django/contrib/admin/tests.py +++ b/django/contrib/admin/tests.py @@ -158,6 +158,18 @@ class AdminSeleniumTestCase(SeleniumTestCase, StaticLiveServerTestCase): actual_values.append(option.get_attribute('value')) self.assertEqual(values, actual_values) + def assertSelectedOptions(self, selector, values): + """ + Asserts that the <SELECT> widget identified by `selector` has the + selected options with the given `values`. + """ + options = self.selenium.find_elements_by_css_selector('%s > option' % selector) + actual_values = [] + for option in options: + if option.get_attribute('selected'): + actual_values.append(option.get_attribute('value')) + self.assertEqual(values, actual_values) + def has_css_class(self, selector, klass): """ Returns True if the element identified by `selector` has the CSS class |