* Api: Fix missing translations in ACL dialog

This commit is contained in:
nathangray
2020-04-07 11:48:52 -06:00
parent 6283b9013b
commit 7462bd0177
2 changed files with 20 additions and 1 deletions

View File

@ -637,6 +637,10 @@ class AdminApp extends EgwApp
// Load checkboxes & their values
content.acl_rights = content.acl_rights ? parseInt(content.acl_rights) : null;
jQuery.extend(content, {acl:[],right:[],label:[]});
// Use this to make sure we get correct app translations
let app_egw = egw(content.acl_appname, window);
for( var right in acl_rights[content.acl_appname])
{
// only user himself is allowed to grant private (16) rights
@ -646,7 +650,7 @@ class AdminApp extends EgwApp
}
content.acl.push(content.acl_rights & parseInt(right));
content.right.push(right);
content.label.push(egw.lang(acl_rights[content.acl_appname][right]));
content.label.push(app_egw.lang(acl_rights[content.acl_appname][right]));
}
}
@ -779,6 +783,20 @@ class AdminApp extends EgwApp
this._acl_dialog(content);
}
/**
* Load the new application's lang files when the app filter is changed
*/
acl_app_change(event, nm)
{
let appname = nm.getWidgetById('filter2').getValue() || '';
if(appname)
{
let app_egw = egw(appname);
app_egw.langRequireApp(window, appname);
nm.getRoot().setApiInstance(app_egw);
}
}
/**
* Callback called on successfull call of serverside ACL handling
*