Commit 85c22dd4 authored by Collin Anderson's avatar Collin Anderson Committed by Tim Graham
Browse files

Fixed #23262 -- Made SelectFilter2.js move items on enter Key press.

parent 2cc8ffe2

django/contrib/admin/static/admin/js/SelectFilter2.js

+6 −1
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ window.SelectFilter = { 
        from_box.setAttribute('name', from_box.getAttribute('name') + '_old');



        // Set up the JavaScript event handlers for the select box filter interface

        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); });

        addEvent(from_box, 'change', function(e) { SelectFilter.refresh_icons(field_id) });
@@ -123,15 +124,19 @@ window.SelectFilter = { 
        $('#' + field_id + '_add_all_link').toggleClass('active', from.find('option').length > 0);

        $('#' + field_id + '_remove_all_link').toggleClass('active', to.find('option').length > 0);

    },

    filter_key_up: function(event, field_id) {

    filter_key_press: function(event, field_id) {

        var from = document.getElementById(field_id + '_from');

        // don't submit form if user pressed Enter

        if ((event.which && event.which == 13) || (event.keyCode && event.keyCode == 13)) {

            from.selectedIndex = 0;

            SelectBox.move(field_id + '_from', field_id + '_to');

            from.selectedIndex = 0;

            event.preventDefault()

            return false;

        }

    },

    filter_key_up: function(event, field_id) {

        var from = document.getElementById(field_id + '_from');

        var temp = from.selectedIndex;

        SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value);

        from.selectedIndex = temp;

tests/admin_widgets/tests.py

+11 −0
Original line number Diff line number Diff line
@@ -942,6 +942,17 @@ class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCas 
            self.assertSelectOptions(to_box,

                        [str(self.peter.id), str(self.jason.id)])



            # -----------------------------------------------------------------

            # Check that pressing enter on a filtered option sends it properly

            # to the 'to' box.

            self.get_select_option(to_box, str(self.jason.id)).click()

            self.selenium.find_element_by_css_selector(remove_link).click()

            input.send_keys('ja')

            self.assertSelectOptions(from_box, [str(self.jason.id)])

            input.send_keys([Keys.ENTER])

            self.assertSelectOptions(to_box, [str(self.peter.id), str(self.jason.id)])

            input.send_keys([Keys.BACK_SPACE, Keys.BACK_SPACE])



        # Save and check that everything is properly stored in the database ---

        self.selenium.find_element_by_xpath('//input[@value="Save"]').click()

        self.wait_page_loaded()