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

fix tablelisting of backup-storages

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-07-27 16:58:22 +02:00
parent ab82695806
commit a86c8535e0
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin_backups.php
View File

@@ -82,15 +82,15 @@ if (($page == 'backups' || $page == 'overview')) {
$log->logAction(FroxlorLogger::ADM_ACTION, LOG_INFO, "list backup storages");
try {
$admin_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.backup_storages.php';
$backup_storage_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.backup_storages.php';
$collection = (new Collection(BackupStorages::class, $userinfo))
->withPagination($admin_list_data['backup_storages_list']['columns'], $admin_list_data['backup_storages_list']['default_sorting']);
->withPagination($backup_storage_list_data['backup_storages_list']['columns'], $backup_storage_list_data['backup_storages_list']['default_sorting']);
} catch (Exception $e) {
Response::dynamicError($e->getMessage());
}
UI::view('user/table.html.twig', [
'listing' => Listing::format($collection, $admin_list_data, 'backup_storages_list'),
'listing' => Listing::format($collection, $backup_storage_list_data, 'backup_storages_list'),
'actions_links' => [
[
'href' => $linker->getLink(['section' => 'backups', 'page' => 'backups']),

1
lib/formfields/admin/backup_storages/formfield.backup_storage_add.php
View File

@@ -81,6 +81,7 @@ return [
'pgp_public_key' => [
'label' => lng('backup.backup_storage.pgp_public_key'),
'type' => 'textarea',
'value' => Settings::Get('backup.default_pgp_public_key')
],
'retention' => [
'label' => lng('backup.backup_storage.retention'),

2
lib/tablelisting/admin/tablelisting.backup_storages.php
View File

@@ -36,7 +36,7 @@ return [
'title' => lng('backup.backup_storages.list'),
'icon' => 'fa-solid fa-file-archive',
'self_overview' => ['section' => 'backups', 'page' => 'storages'],
'default_sorting' => ['loginname' => 'asc'],
'default_sorting' => ['description' => 'asc'],
'columns' => [
'id' => [
'label' => 'ID',