From f115c63f8afca30b8355883aa9c294200990d954 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Tue, 23 Feb 2021 00:05:15 +0200
Subject: [PATCH] prefer link-registry "entries" for data over app-name

---
 admin/inc/class.admin_acl.inc.php |  5 +++--
 admin/js/app.js                   |  2 +-
 admin/js/app.ts                   |  3 ++-
 admin/templates/default/acl.xet   | 12 +++---------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/admin/inc/class.admin_acl.inc.php b/admin/inc/class.admin_acl.inc.php
index 89a5368cdb..ba1652f06f 100644
--- a/admin/inc/class.admin_acl.inc.php
+++ b/admin/inc/class.admin_acl.inc.php
@@ -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;
diff --git a/admin/js/app.js b/admin/js/app.js
index 321ab69916..eb8a252b8e 100644
--- a/admin/js/app.js
+++ b/admin/js/app.js
@@ -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) {
diff --git a/admin/js/app.ts b/admin/js/app.ts
index 05ba3f915f..96c3b8eea3 100644
--- a/admin/js/app.ts
+++ b/admin/js/app.ts
@@ -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) {
diff --git a/admin/templates/default/acl.xet b/admin/templates/default/acl.xet
index 08c4cd6bdc..bf7370a59b 100644
--- a/admin/templates/default/acl.xet
+++ b/admin/templates/default/acl.xet
@@ -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]"/>