Ticket #6183: django-6183.patch

django/contrib/admin/media/js/SelectFilter2.js

@@ -14 +14 @@
     return node;
 }
 
+function findSelectMultipleHelpTextNode(node) {
+    var nodes = node.getElementsByTagName('span');
+    for (var i=0, length=nodes.length; i<length; i++) {
+        if (nodes[i].className == 'select-multiple-help-text') {
+            // assume there's only one
+            return nodes[i];
+        }
+    }
+    return null;
+}
+
+function findHelpTextNodes(node) {
+    var nodes = node.getElementsByTagName('p');
+    var result = [];
+    for (var i=0, length=nodes.length; i<length; i++) {
+        if (nodes[i].className == 'help') {
+            result.push(nodes[i]);
+        }
+    }
+    return result;
+}
+
 var SelectFilter = {
     init: function(field_id, field_name, is_stacked, admin_media_prefix) {
         var from_box = document.getElementById(field_id);
         from_box.id += '_from'; // change its ID
         from_box.className = 'filtered';
 
-        // Remove <p class="info">, because it just gets in the way.
-        var ps = from_box.parentNode.getElementsByTagName('p');
-        for (var i=0; i<ps.length; i++) {
-            from_box.parentNode.removeChild(ps[i]);
+        // Find and remove the span tag wich holds the
+        // 'Hold down "Control", or "Command" on a Mac, to select more than one.'
+        // message.
+        var smhelp_node = findSelectMultipleHelpTextNode(from_box.parentNode);
+        if (smhelp_node) {
+            smhelp_node.parentNode.removeChild(smhelp_node);
         }
 
+        // Find and remove all user supplied help_text's.
+        var help_text_nodes = findHelpTextNodes(from_box.parentNode);
+        for (var i = help_text_nodes.length - 1; i >= 0; i--) {
+            var node = help_text_nodes[i];
+            var parent = node.parentNode;
+           
+            if (node !== parent.firstChild) {
+                parent.insertBefore(help_text_nodes[i], parent.firstChild);
+            }
+        } 
+
         // <div class="selector"> or <div class="selector stacked">
         var selector_div = quickElement('div', from_box.parentNode);
         selector_div.className = is_stacked ? 'selector stacked' : 'selector';

django/db/models/fields/related.py

@@ -813 +813 @@
 
         Field.__init__(self, **kwargs)
 
-        msg = ugettext_lazy('Hold down "Control", or "Command" on a Mac, to select more than one.')
+        msg = ugettext_lazy('<span class="select-multiple-help-text">Hold down "Control", or "Command" on a Mac, to select more than one.</span>')
         self.help_text = string_concat(self.help_text, ' ', msg)
 
     def get_choices_default(self):