maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix column-customizer for non-api based resources; add more no_search=true tags in various tablelistings where search is not available

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-16 13:35:50 +02:00
parent 64142d2158
commit 68c93a17b3
8 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_settings.php
View File

@@ -258,7 +258,7 @@ if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
]; ];
UI::view('user/table.html.twig', [ 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' => [ 'actions_links' => [
[ [
'href' => $linker->getLink(['section' => 'settings', 'page' => $page, 'action' => 'fix']), 'href' => $linker->getLink(['section' => 'settings', 'page' => $page, 'action' => 'fix']),

4
admin_templates.php
View File

@@ -175,8 +175,8 @@ if ($action == '') {
} }
UI::view('user/table-tpl.html.twig', [ UI::view('user/table-tpl.html.twig', [
'maillisting' => Listing::formatFromArray($collection_mail, $mailtpl_list_data['mailtpl_list']), 'maillisting' => Listing::formatFromArray($collection_mail, $mailtpl_list_data['mailtpl_list'], 'mailtpl_list'),
'filelisting' => Listing::formatFromArray($collection_file, $filetpl_list_data['filetpl_list']), 'filelisting' => Listing::formatFromArray($collection_file, $filetpl_list_data['filetpl_list'], 'filetpl_list'),
'actions_links' => array_merge($mail_actions_links, $file_actions_links) 'actions_links' => array_merge($mail_actions_links, $file_actions_links)
]); ]);
} elseif ($action == 'delete' && $subjectid != 0 && $mailbodyid != 0) { } elseif ($action == 'delete' && $subjectid != 0 && $mailbodyid != 0) {

2
api_keys.php
View File

@@ -165,7 +165,7 @@ $collection = [
$tpl = 'user/table.html.twig'; $tpl = 'user/table.html.twig';
UI::view($tpl, [ 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 ? [ 'actions_links' => (int)$userinfo['api_allowed'] == 1 ? [
[ [
'href' => $linker->getLink(['section' => 'index', 'page' => $page, 'action' => 'add']), 'href' => $linker->getLink(['section' => 'index', 'page' => $page, 'action' => 'add']),

3
lib/Froxlor/UI/Listing.php
View File

@@ -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 [ return [
'id' => $id,
'title' => $tabellisting['title'], 'title' => $tabellisting['title'],
'description' => $tabellisting['description'] ?? null, 'description' => $tabellisting['description'] ?? null,
'icon' => $tabellisting['icon'] ?? null, 'icon' => $tabellisting['icon'] ?? null,

1
lib/tablelisting/admin/tablelisting.filetemplates.php
View File

@@ -31,6 +31,7 @@ return [
'icon' => 'fa-solid fa-file-lines', 'icon' => 'fa-solid fa-file-lines',
'self_overview' => ['section' => 'templates', 'page' => 'email'], 'self_overview' => ['section' => 'templates', 'page' => 'email'],
'default_sorting' => ['template' => 'asc'], 'default_sorting' => ['template' => 'asc'],
'no_search' => true,
'columns' => [ 'columns' => [
'template' => [ 'template' => [
'label' => lng('admin.templates.action'), 'label' => lng('admin.templates.action'),

1
lib/tablelisting/admin/tablelisting.integrity.php
View File

@@ -33,6 +33,7 @@ return [
'icon' => 'fa-solid fa-circle-check', 'icon' => 'fa-solid fa-circle-check',
'self_overview' => ['section' => 'settings', 'page' => 'integritycheck'], 'self_overview' => ['section' => 'settings', 'page' => 'integritycheck'],
'default_sorting' => ['displayid' => 'asc'], 'default_sorting' => ['displayid' => 'asc'],
'no_search' => true,
'columns' => [ 'columns' => [
'displayid' => [ 'displayid' => [
'label' => 'ID', 'label' => 'ID',

1
lib/tablelisting/admin/tablelisting.mailtemplates.php
View File

@@ -31,6 +31,7 @@ return [
'icon' => 'fa-solid fa-envelope', 'icon' => 'fa-solid fa-envelope',
'self_overview' => ['section' => 'templates', 'page' => 'email'], 'self_overview' => ['section' => 'templates', 'page' => 'email'],
'default_sorting' => ['template' => 'asc'], 'default_sorting' => ['template' => 'asc'],
'no_search' => true,
'columns' => [ 'columns' => [
'language' => [ 'language' => [
'label' => lng('login.language'), 'label' => lng('login.language'),

1
lib/tablelisting/tablelisting.apikeys.php
View File

@@ -33,6 +33,7 @@ return [
'title' => lng('menue.main.apikeys'), 'title' => lng('menue.main.apikeys'),
'icon' => 'fa-solid fa-key', 'icon' => 'fa-solid fa-key',
'self_overview' => ['section' => 'index', 'page' => 'apikeys'], 'self_overview' => ['section' => 'index', 'page' => 'apikeys'],
'no_search' => true,
'columns' => [ 'columns' => [
'a.loginname' => [ 'a.loginname' => [
'label' => lng('login.username'), 'label' => lng('login.username'),