Index: media/js/admin/RelatedObjectLookups.js
===================================================================
--- media/js/admin/RelatedObjectLookups.js (revision 1813)
+++ media/js/admin/RelatedObjectLookups.js (working copy)
@@ -3,7 +3,13 @@
function showRelatedObjectLookupPopup(triggeringLink) {
var name = triggeringLink.id.replace(/^lookup_/, '');
- var win = window.open(triggeringLink.href + '?pop=1', name, 'height=500,width=740,resizable=yes,scrollbars=yes');
+ var href
+ if (triggeringLink.href.search(/\?/) >= 0) {
+ href = triggeringLink.href + '&pop=1';
+ } else {
+ href = triggeringLink.href + '?pop=1'
+ }
+ var win = window.open(href, name, 'height=500,width=740,resizable=yes,scrollbars=yes');
win.focus();
return false;
}
Index: templates/widget/foreign.html
===================================================================
--- templates/widget/foreign.html (revision 1813)
+++ templates/widget/foreign.html (working copy)
@@ -1,7 +1,11 @@
{% load admin_modify adminmedia %}
{% output_all bound_field.form_fields %}
{% if bound_field.raw_id_admin %}
+{% if bound_field.field.rel.limit_choices_to %}
+
+{% else %}
+{% endif %}
{% else %}
{% if bound_field.needs_add_label %}