From 75a3e920984eb37616c4bd32356a74ff9e0db247 Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Fri, 31 Jan 2020 11:20:45 +0530 Subject: [PATCH] =?UTF-8?q?Fixed=20an=20issue=20where=20logout=20inactive?= =?UTF-8?q?=20session=20did=20not=20work=20when=C2=A0a=20new=20tab=20is=20?= =?UTF-8?q?opened=20from=20the=20already=20opened=20tab.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/pgadmin/static/js/window.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/pgadmin/static/js/window.js b/web/pgadmin/static/js/window.js index 253f95f78..8377b2787 100644 --- a/web/pgadmin/static/js/window.js +++ b/web/pgadmin/static/js/window.js @@ -7,11 +7,16 @@ // ////////////////////////////////////////////////////////////// +let getWindowOpener = (opener) => { + return opener.opener && opener.opener.pgAdmin ? getWindowOpener(opener.opener) : opener; +}; + let pgWindow = function() { let pgWindow = null; try { if(window.opener && window.opener.pgAdmin) { - pgWindow = window.opener; + /* Windows can be opened at multiple levels */ + pgWindow = getWindowOpener(window.opener); } else if(window.parent && window.parent.pgAdmin){ pgWindow = window.parent; } else if(window.top && window.top.pgAdmin){