holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clientside redirect ignore appname only for popups, not eg. iframes like in admin

Browse Source
This commit is contained in:
Ralf Becker 2014-11-19 16:17:00 +00:00
parent c8dabaff43
commit 558076686f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/js/jsapi/egw_json.js
View File

@ -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;
}