diff --git a/admin_settings.php b/admin_settings.php index 83df50db..df45b28e 100644 --- a/admin_settings.php +++ b/admin_settings.php @@ -258,7 +258,7 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') { ]; UI::view('user/table.html.twig', [ - 'listing' => Listing::formatFromArray($collection, $integrity_list_data['integrity_list']), + 'listing' => Listing::formatFromArray($collection, $integrity_list_data['integrity_list'], 'integrity_list'), 'actions_links' => [ [ 'href' => $linker->getLink(['section' => 'settings', 'page' => $page, 'action' => 'fix']), diff --git a/admin_templates.php b/admin_templates.php index db77e612..c381e354 100644 --- a/admin_templates.php +++ b/admin_templates.php @@ -175,8 +175,8 @@ if ($action == '') { } UI::view('user/table-tpl.html.twig', [ - 'maillisting' => Listing::formatFromArray($collection_mail, $mailtpl_list_data['mailtpl_list']), - 'filelisting' => Listing::formatFromArray($collection_file, $filetpl_list_data['filetpl_list']), + 'maillisting' => Listing::formatFromArray($collection_mail, $mailtpl_list_data['mailtpl_list'], 'mailtpl_list'), + 'filelisting' => Listing::formatFromArray($collection_file, $filetpl_list_data['filetpl_list'], 'filetpl_list'), 'actions_links' => array_merge($mail_actions_links, $file_actions_links) ]); } elseif ($action == 'delete' && $subjectid != 0 && $mailbodyid != 0) { diff --git a/api_keys.php b/api_keys.php index 36fffa46..bfedf322 100644 --- a/api_keys.php +++ b/api_keys.php @@ -165,7 +165,7 @@ $collection = [ $tpl = 'user/table.html.twig'; UI::view($tpl, [ - 'listing' => Listing::formatFromArray($collection, $apikeys_list_data['apikeys_list']), + 'listing' => Listing::formatFromArray($collection, $apikeys_list_data['apikeys_list'], 'apikyes_list'), 'actions_links' => (int)$userinfo['api_allowed'] == 1 ? [ [ 'href' => $linker->getLink(['section' => 'index', 'page' => $page, 'action' => 'add']), diff --git a/lib/Froxlor/UI/Listing.php b/lib/Froxlor/UI/Listing.php index 1fb25c75..0d95ab69 100644 --- a/lib/Froxlor/UI/Listing.php +++ b/lib/Froxlor/UI/Listing.php @@ -57,9 +57,10 @@ class Listing ]; } - public static function formatFromArray(array $collection, array $tabellisting): array + public static function formatFromArray(array $collection, array $tabellisting, string $id): array { return [ + 'id' => $id, 'title' => $tabellisting['title'], 'description' => $tabellisting['description'] ?? null, 'icon' => $tabellisting['icon'] ?? null, diff --git a/lib/tablelisting/admin/tablelisting.filetemplates.php b/lib/tablelisting/admin/tablelisting.filetemplates.php index 707b35c6..d762fa82 100644 --- a/lib/tablelisting/admin/tablelisting.filetemplates.php +++ b/lib/tablelisting/admin/tablelisting.filetemplates.php @@ -31,6 +31,7 @@ return [ 'icon' => 'fa-solid fa-file-lines', 'self_overview' => ['section' => 'templates', 'page' => 'email'], 'default_sorting' => ['template' => 'asc'], + 'no_search' => true, 'columns' => [ 'template' => [ 'label' => lng('admin.templates.action'), diff --git a/lib/tablelisting/admin/tablelisting.integrity.php b/lib/tablelisting/admin/tablelisting.integrity.php index e53c1b04..06f0c71f 100644 --- a/lib/tablelisting/admin/tablelisting.integrity.php +++ b/lib/tablelisting/admin/tablelisting.integrity.php @@ -33,6 +33,7 @@ return [ 'icon' => 'fa-solid fa-circle-check', 'self_overview' => ['section' => 'settings', 'page' => 'integritycheck'], 'default_sorting' => ['displayid' => 'asc'], + 'no_search' => true, 'columns' => [ 'displayid' => [ 'label' => 'ID', diff --git a/lib/tablelisting/admin/tablelisting.mailtemplates.php b/lib/tablelisting/admin/tablelisting.mailtemplates.php index 768769c0..4fb0aeff 100644 --- a/lib/tablelisting/admin/tablelisting.mailtemplates.php +++ b/lib/tablelisting/admin/tablelisting.mailtemplates.php @@ -31,6 +31,7 @@ return [ 'icon' => 'fa-solid fa-envelope', 'self_overview' => ['section' => 'templates', 'page' => 'email'], 'default_sorting' => ['template' => 'asc'], + 'no_search' => true, 'columns' => [ 'language' => [ 'label' => lng('login.language'), diff --git a/lib/tablelisting/tablelisting.apikeys.php b/lib/tablelisting/tablelisting.apikeys.php index a6ffcc7c..01857ee1 100644 --- a/lib/tablelisting/tablelisting.apikeys.php +++ b/lib/tablelisting/tablelisting.apikeys.php @@ -33,6 +33,7 @@ return [ 'title' => lng('menue.main.apikeys'), 'icon' => 'fa-solid fa-key', 'self_overview' => ['section' => 'index', 'page' => 'apikeys'], + 'no_search' => true, 'columns' => [ 'a.loginname' => [ 'label' => lng('login.username'),