Ticket #4134: django-0.96-contrib-admin-raw_id_admin-repr_on_select_change.diff

media/js/admin/RelatedObjectLookups.js

@@ -11 +11 @@
     } else {
         href = triggeringLink.href + '?pop=1';
     }
-    var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
+    var win = window.open(href, name, 'height=500,width=1000,resizable=yes,scrollbars=yes');
     win.focus();
     return false;
 }
 
-function dismissRelatedLookupPopup(win, chosenId) {
+function dismissRelatedLookupPopup(win, chosenId, chosenRepr) {
     var name = win.name.replace(/___/g, '.');
     var elem = document.getElementById(name);
     if (elem.className.indexOf('vRawIdAdminField') != -1 && elem.value) {
         elem.value += ',' + chosenId;
     } else {
-        document.getElementById(name).value = chosenId;
+        var node = document.getElementById(name);
+        var parentNode = node.parentNode;
+        var strongNodes = parentNode.getElementsByTagName("strong");
+        node.value = chosenId;
+        if (strongNodes.length==1) {
+            // change repr
+            strongNodes[0].innerHTML = chosenRepr;
+        } else if (strongNodes.length==0) {
+            // add repr
+            var strong = document.createElement("strong");
+            strong.innerHTML = chosenRepr;
+            parentNode.appendChild(strong);
+        }
     }
     win.close();
 }

templatetags/admin_list.py

@@ -8 +8 @@
 from django.utils.text import capfirst
 from django.utils.translation import get_date_formats, get_partial_date_formats
 from django.template import Library
+from django.template.defaultfilters import truncatewords
 import datetime
 
 register = Library()
@@ -187 +188 @@
             url = cl.url_for_result(result)
             result_id = str(getattr(result, pk)) # str() is needed in case of 23L (long ints)
             yield ('<%s%s><a href="%s"%s>%s</a></%s>' % \
-                (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %r); return false;"' % result_id or ''), result_repr, table_tag))
+                (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %r, %r); return false;"' % (result_id or '', escape(truncatewords(result_repr,14)))), result_repr, table_tag))
         else:
             yield ('<td%s>%s</td>' % (row_class, result_repr))