Ticket #13883: RelatedObjectLookups.js.diff

js/admin/RelatedObjectLookups.js

@@ -66 +66 @@
     return false;
 }
 
-function dismissAddAnotherPopup(win, newId, newRepr) {
-    // newId and newRepr are expected to have previously been escaped by
+function dismissAddAnotherPopup(win, newId, newRepr, newGrp) {
+    // newId, newRepr and newGrp are expected to have previously been escaped by
     // django.utils.html.escape.
     newId = html_unescape(newId);
     newRepr = html_unescape(newRepr);
+    newGrp = newGrp? html_unescape(newGrp): null;
     var name = windowname_to_id(win.name);
     var elem = document.getElementById(name);
-    if (elem) {
+    if (elem) { //simple selects
         if (elem.nodeName == 'SELECT') {
             var o = new Option(newRepr, newId);
-            elem.options[elem.options.length] = o;
+            if(newGrp) { //find/create option group
+                var grps = elem.getElementsByTagName('optgroup');
+                var grp = null;
+                for(var i=0; i < grps.length; i++) {
+                    if(grps[i].getAttribute('label') == newGrp) {
+                        grp = grps[i];
+                        break;
+                    }
+                }
+                if(grp == null) {
+                    grp = document.createElement('optgroup');
+                    grp.setAttribute('label', newGrp);
+                    elem.appendChild(grp);
+                }
+                grp.appendChild(o);
+            } else {
+                elem.options[elem.options.length] = o;
+            }
             o.selected = true;
         } else if (elem.nodeName == 'INPUT') {
             if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
@@ -89 +107 @@
         var toId = name + "_to";
         elem = document.getElementById(toId);
         var o = new Option(newRepr, newId);
-        SelectBox.add_to_cache(toId, o);
+        SelectBox.add_to_cache(toId, o, newGrp);
         SelectBox.redisplay(toId);
     }
     win.close();