extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-14 10:28:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Admin/all apps: fix refresh of admin after calling site configuration, categories, etc from apps

Browse Source
This commit is contained in:
Ralf Becker
2014-07-08 13:52:48 +00:00
parent 26a58a10a5
commit f864753113
5 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
admin/js/app.js
View File

@ -87,6 +87,11 @@ app.classes.admin = AppJS.extend(
var self = this;
jQuery(iframe.getDOMNode()).off('load.admin')
.bind('load.admin', function(){
if (this.contentDocument.location.href.match(/(\/admin\/|\/admin\/index.php|menuaction=admin.admin_ui.index)/))
{
this.contentDocument.location.href = 'about:blank'; // stops redirect from admin/index.php
self.load(); // load own top-level index aka user-list
}
self._hide_navbar.call(self);
}
);
@ -115,6 +120,8 @@ app.classes.admin = AppJS.extend(
else
{
this.egw.app_header('');
// blank iframe, to not keep something running there
this.iframe.getDOMNode().contentDocument.location.href = 'about:blank';
}
this.iframe.set_disabled(!_url);
this.nm.set_disabled(!!_url);
@ -160,6 +167,12 @@ app.classes.admin = AppJS.extend(
return false; // --> no regular refresh
}
}
// not a user or group, eg. categories
else if (!_id)
{
this.load();
return false; // --> no regular refresh needed
}
}
},