Ticket #7028: improved-raw-id-admin-feedback-fixed-insertion.diff

contrib/admin/media/js/admin/RelatedObjectLookups.js

@@ -26 +26 @@
     return false;
 }
 
-function dismissRelatedLookupPopup(win, chosenId) {
+function dismissRelatedLookupPopup(win, chosenId, chosenName) {
     var name = win.name.replace(/___/g, '.');
     var elem = document.getElementById(name);
+    var nameElem = document.getElementById("view_lookup_" + name);
     if (elem.className.indexOf('vManyToManyRawIdAdminField') != -1 && elem.value) {
         elem.value += ',' + chosenId;
     } else {
         document.getElementById(name).value = chosenId;
     }
+    if(nameElem) {
+      nameElem.innerHTML = chosenName;
+    }
     win.close();
 }
 

contrib/admin/templatetags/admin_list.py

@@ -196 +196 @@
             # Convert the pk to something that can be used in Javascript.
             # Problem cases are long ints (23L) and non-ASCII strings.
             result_id = repr(force_unicode(getattr(result, pk)))[1:]
+            result_name = repr(force_unicode(result))[1:]
             yield mark_safe(u'<%s%s><a href="%s"%s>%s</a></%s>' % \
-                (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %s); return false;"' % result_id or ''), conditional_escape(result_repr), table_tag))
+                (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %s, %s); return false;"' % (result_id or '', result_name)), conditional_escape(result_repr), table_tag))
         else:
             yield mark_safe(u'<td%s>%s</td>' % (row_class, conditional_escape(result_repr)))
 

contrib/admin/widgets.py

@@ -101 +101 @@
         output.append('<a href="%s%s" class="related-lookup" id="lookup_id_%s" onclick="return showRelatedObjectLookupPopup(this);"> ' % \
             (related_url, url, name))
         output.append('<img src="%simg/admin/selector-search.gif" width="16" height="16" alt="Lookup"></a>' % settings.ADMIN_MEDIA_PREFIX)
-        if value:
-            output.append(self.label_for_value(value))
+        # TODO: "id_" is hard-coded here. This should instead use the correct
+        # API to determine the ID dynamically.
+        output.append(self.label_for_value(value, "id_%s" % name))
         return mark_safe(u''.join(output))
     
-    def label_for_value(self, value):
-        return '&nbsp;<strong>%s</strong>' % \
-            truncate_words(self.rel.to.objects.get(pk=value), 14)
+    def label_for_value(self, value, name=''):
+        # Placeholder used to display description during insertion
+        if value:
+            value = self.rel.to.objects.get(pk=value)
+        else:
+            value = ''
+        return '&nbsp;<strong id="view_lookup_%s">%s</strong>' % \
+            (name, truncate_words(value, 14))
             
 class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
     """