extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-24 06:48:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

prefer link-registry "entries" for data over app-name

Browse Source
This commit is contained in:
Ralf Becker 2021-02-23 00:05:15 +02:00
parent 2455b7176d
commit f115c63f8a
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/inc/class.admin_acl.inc.php
View File

@ -256,7 +256,7 @@ class admin_acl
// Get supporting or all apps for filter2 depending on filter
if($query['filter'] == 'run')
{
$rows['sel_options']['filter2'] = array(
$rows['sel_options']['acl_appname'] = $rows['sel_options']['filter2'] = array(
'' => lang('All applications'),
)+Etemplate\Widget\Select::app_options('enabled');
}
@ -273,12 +273,13 @@ class admin_acl
{
$rows['sel_options']['filter2'][] = array(
'value' => $appname,
'label' => lang($appname)
'label' => lang(Api\Link::get_registry($appname, 'entries')) ?? lang($appname)
);
}
usort($rows['sel_options']['filter2'], function($a,$b) {
return strcasecmp($a['label'], $b['label']);
});
$rows['sel_options']['acl_appname'] = $rows['sel_options']['filter2'];
}
return $total;

2
admin/js/app.js
View File

@ -575,7 +575,7 @@ var AdminApp = /** @class */ (function (_super) {
// Restrict application selectbox to only apps that support ACL
sel_options.acl_appname = [];
for (var app_1 in acl_rights) {
sel_options.acl_appname.push({ value: app_1, label: this.egw.lang(app_1) });
sel_options.acl_appname.push({ value: app_1, label: this.egw.lang(this.egw.link_get_registry(app_1, 'entries') || app_1) });
}
// Sort list
sel_options.acl_appname.sort(function (a, b) {

3
admin/js/app.ts
View File

@ -654,7 +654,8 @@ class AdminApp extends EgwApp
sel_options.acl_appname = [];
for(let app in acl_rights)
{
sel_options.acl_appname.push({value: app, label: this.egw.lang(app)});
sel_options.acl_appname.push({value: app, label: this.egw.lang(
<string>this.egw.link_get_registry(app, 'entries') || app)});
}
// Sort list
sel_options.acl_appname.sort(function(a,b) {

12
admin/templates/default/acl.xet
View File

@ -38,15 +38,9 @@
</row>
<row class="$row_cont[class]">
<appicon align="center" src="$row_cont[acl_appname]" class="admin_aclApp"/>
<menulist>
<menupopup type="select-app" id="${row}[acl_appname]" readonly="true"/>
</menulist>
<menulist>
<menupopup type="select-account" id="${row}[acl_account]" readonly="true"/>
</menulist>
<menulist>
<menupopup type="select-account" id="${row}[acl_location]" readonly="true"/>
</menulist>
<select id="${row}[acl_appname]" readonly="true"/>
<select-account id="${row}[acl_account]" readonly="true"/>
<select-account id="${row}[acl_location]" readonly="true"/>
<description id="${row}[acl1]"/>
<description id="${row}[acl2]"/>
<description id="${row}[acl4]"/>