innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #1635 -- Admin-site related-object popup no longer fails for edit_inline objects in IE/Win. Thanks, Christopher Lenz 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3066 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-06-02 17:53:00 +00:00
parent 06edf11a03
commit 688cd55708
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/admin/media/js/admin/RelatedObjectLookups.js
View File

@ -3,6 +3,8 @@
function showRelatedObjectLookupPopup(triggeringLink) { function showRelatedObjectLookupPopup(triggeringLink) {
var name = triggeringLink.id.replace(/^lookup_/, ''); var name = triggeringLink.id.replace(/^lookup_/, '');
// IE doesn't like periods in the window name, so convert temporarily.
name = name.replace(/\./g, '___');
var href; var href;
if (triggeringLink.href.search(/\?/) >= 0) { if (triggeringLink.href.search(/\?/) >= 0) {
href = triggeringLink.href + '&pop=1'; href = triggeringLink.href + '&pop=1';
@ -15,11 +17,12 @@ function showRelatedObjectLookupPopup(triggeringLink) {
} }
function dismissRelatedLookupPopup(win, chosenId) { function dismissRelatedLookupPopup(win, chosenId) {
var elem = document.getElementById(win.name); var name = win.name.replace(/___/g, '.');
var elem = document.getElementById(name);
if (elem.className.indexOf('vRawIdAdminField') != -1 && elem.value) { if (elem.className.indexOf('vRawIdAdminField') != -1 && elem.value) {
elem.value += ',' + chosenId; elem.value += ',' + chosenId;
} else { } else {
document.getElementById(win.name).value = chosenId; document.getElementById(name).value = chosenId;
} }
win.close(); win.close();
} }