From 8aa71722eedc71e36276fabf0ddbda4eb0259a9c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 19 Nov 2014 16:10:39 +0000 Subject: [PATCH] clientside redirect ignore appname only for popups, not eg. iframes like in admin --- phpgwapi/js/jsapi/egw_json.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/phpgwapi/js/jsapi/egw_json.js b/phpgwapi/js/jsapi/egw_json.js index 6292e72c37..89c08e34b9 100644 --- a/phpgwapi/js/jsapi/egw_json.js +++ b/phpgwapi/js/jsapi/egw_json.js @@ -406,8 +406,9 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd) { { egw_topWindow().location.href = res.data.url; } - // json request was originating from a different window --> redirect that one - else if(this && this.DOMContainer && this.DOMContainer.ownerDocument.defaultView != window) + // json request was originating from a different popup --> redirect that one + else if(this && this.DOMContainer && this.DOMContainer.ownerDocument.defaultView != window && + egw(this.DOMContainer.ownerDocument.defaultView).is_popup()) { this.DOMContainer.ownerDocument.location.href = res.data.url; }