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

re-enable/fix sortable tablelisting flag

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-01-08 17:25:19 +01:00
parent d69a7eeb07
commit d42072e3ad
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Froxlor/UI/Collection.php
View File

@@ -113,17 +113,15 @@ class Collection
public function withPagination(array $columns, array $default_sorting = []): Collection public function withPagination(array $columns, array $default_sorting = []): Collection
{ {
// Get only searchable columns // Get only searchable columns
/*
$sortableColumns = []; $sortableColumns = [];
foreach ($columns as $key => $column) { foreach ($columns as $key => $column) {
if (isset($column['sortable']) && $column['sortable']) { if (!isset($column['sortable']) || (isset($column['sortable']) && $column['sortable'])) {
$sortableColumns[$key] = $column; $sortableColumns[$key] = $column;
} }
} }
*/
// Prepare pagination // Prepare pagination
$this->pagination = new Pagination($columns, $this->count(), (int)Settings::Get('panel.paging'), $default_sorting); $this->pagination = new Pagination($sortableColumns, $this->count(), (int)Settings::Get('panel.paging'), $default_sorting);
$this->params = array_merge($this->params, $this->pagination->getApiCommandParams()); $this->params = array_merge($this->params, $this->pagination->getApiCommandParams());
return $this; return $this;

2
lib/tablelisting/tablelisting.sslcertificates.php
View File

@@ -54,11 +54,13 @@ return [
'label' => lng('ssl_certificates.valid_from'), 'label' => lng('ssl_certificates.valid_from'),
'field' => 'validfromdate', 'field' => 'validfromdate',
'searchable' => false, 'searchable' => false,
'sortable' => false,
], ],
'c.validtodate' => [ 'c.validtodate' => [
'label' => lng('ssl_certificates.valid_until'), 'label' => lng('ssl_certificates.valid_until'),
'field' => 'validtodate', 'field' => 'validtodate',
'searchable' => false, 'searchable' => false,
'sortable' => false,
], ],
], ],
'visible_columns' => Listing::getVisibleColumnsForListing('sslcertificates_list', [ 'visible_columns' => Listing::getVisibleColumnsForListing('sslcertificates_list', [