extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 04:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix resources categories shown in iframe

Browse Source
This commit is contained in:
Hadi Nategh 2016-06-13 17:31:43 +02:00
parent e54a56efd6
commit 885ed833e1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/js/jsapi/egw_preferences.js
View File

@ -116,7 +116,7 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function()
show_preferences: function (name, apps) show_preferences: function (name, apps)
{ {
var current_app = this.app_name(); var current_app = this.app_name();
var query = {current_app: current_app}; var query = {menuaction:'',current_app: current_app};
// give warning, if app does not support given type, but all apps link to common prefs, if they dont support prefs themselfs // give warning, if app does not support given type, but all apps link to common prefs, if they dont support prefs themselfs
if (jQuery.isArray(apps) && jQuery.inArray(current_app, apps) == -1 && (name != 'prefs' && name != 'acl') || if (jQuery.isArray(apps) && jQuery.inArray(current_app, apps) == -1 && (name != 'prefs' && name != 'acl') ||
!jQuery.isArray(apps) && (typeof apps[current_app] == 'undefined' || !apps[current_app])) !jQuery.isArray(apps) && (typeof apps[current_app] == 'undefined' || !apps[current_app]))
@ -150,11 +150,10 @@ egw.extend('preferences', egw.MODULE_GLOBAL, function()
} }
else else
{ {
delete query.current_app;
query.menuaction='preferences.preferences_categories_ui.index'; query.menuaction='preferences.preferences_categories_ui.index';
query.cats_app=current_app; query.cats_app=current_app;
query.ajax = true;
} }
query.ajax = true;
egw.link_handler(egw.link(url, query), current_app); egw.link_handler(egw.link(url, query), current_app);
break; break;
} }