Commit 688cd557 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #1635 -- Admin-site related-object popup no longer fails for edit_inline... 

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
parent 06edf11a

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

+5 −2
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


function showRelatedObjectLookupPopup(triggeringLink) {

    var name = triggeringLink.id.replace(/^lookup_/, '');

    // IE doesn't like periods in the window name, so convert temporarily.

    name = name.replace(/\./g, '___');

    var href;

    if (triggeringLink.href.search(/\?/) >= 0) {

        href = triggeringLink.href + '&pop=1';
@@ -15,11 +17,12 @@ function showRelatedObjectLookupPopup(triggeringLink) { 
}



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) {

        elem.value += ',' + chosenId;

    } else {

        document.getElementById(win.name).value = chosenId;

        document.getElementById(name).value = chosenId;

    }

    win.close();

}