Ticket #13614: 13614.filterselect-webkit-bug.diff

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

@@ -21 +21 @@
             return;
         }
         var from_box = document.getElementById(field_id);
-        from_box.id += '_from'; // change its ID
+
+        // Create a clone to keep the actual values to be sent with the form
+        var real_box = $(from_box).clone().insertBefore(from_box).hide();
+
+        from_box.id += '_from';
+        from_box.name += '_from';
         from_box.className = 'filtered';
 
         var ps = from_box.parentNode.getElementsByTagName('p');
@@ -77 +82 @@
         var title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Added %s') + ' ', [field_name]));
         quickElement('img', title_chosen, '', 'src', admin_media_prefix + 'img/icon-unknown.gif', 'width', '10', 'height', '10', 'class', 'help help-tooltip', 'title', interpolate(gettext('This is the list of added %s. You may remove some by selecting them below and then clicking the "Remove" button.'), [field_name]));
 
-        var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name'));
+        var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', real_box.attr('name') + '_to');
         to_box.className = 'filtered';
         var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'href', 'javascript: (function() { SelectBox.move_all("' + field_id + '_to", "' + field_id + '_from"); SelectFilter.refresh_icons("' + field_id + '");})()', 'id', field_id + '_remove_all_link');
         clear_all.className = 'selector-clearall';
 
-        from_box.setAttribute('name', from_box.getAttribute('name') + '_old');
-
         // Set up the JavaScript event handlers for the select box filter interface
         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) });
-        addEvent(to_box, 'change', function(e) { SelectFilter.refresh_icons(field_id) });
-        addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_icons(field_id); });
-        addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_icons(field_id); });
+        addEvent(from_box, 'change', function(e) { SelectFilter.refresh_state(field_id) });
+        addEvent(to_box, 'change', function(e) { SelectFilter.refresh_state(field_id) });
+        addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); SelectFilter.refresh_state(field_id); });
+        addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); SelectFilter.refresh_state(field_id); });
         addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); });
         SelectBox.init(field_id + '_from');
         SelectBox.init(field_id + '_to');
@@ -103 +106 @@
         }
 
         // Initial icon refresh
-        SelectFilter.refresh_icons(field_id);
+        SelectFilter.refresh_state(field_id);
     },
-    refresh_icons: function(field_id) {
+    refresh_state: function(field_id) {
+        // Refresh icons
+        var real = $('#' + field_id);
         var from = $('#' + field_id + '_from');
         var to = $('#' + field_id + '_to');
         var is_from_selected = from.find('option:selected').length > 0;
@@ -116 +121 @@
         // Active if the corresponding box isn't empty
         $('#' + field_id + '_add_all_link').toggleClass('active', from.find('option').length > 0);
         $('#' + field_id + '_remove_all_link').toggleClass('active', to.find('option').length > 0);
+
+        // Refresh selected items
+        real.find('option').attr('selected', false); // Deselect everything
+        to.find('option').each(function() {
+            // Select the same options as the ones present in the 'to' box.
+            real.find('option[value="' + this.value + '"]').attr('selected', true);
+        });
     },
     filter_key_up: function(event, field_id) {
         var from = document.getElementById(field_id + '_from');