diff --git a/lib/Froxlor/UI/Collection.php b/lib/Froxlor/UI/Collection.php index 73a06783..4a43ca09 100644 --- a/lib/Froxlor/UI/Collection.php +++ b/lib/Froxlor/UI/Collection.php @@ -113,17 +113,15 @@ class Collection public function withPagination(array $columns, array $default_sorting = []): Collection { // Get only searchable columns - /* $sortableColumns = []; foreach ($columns as $key => $column) { - if (isset($column['sortable']) && $column['sortable']) { + if (!isset($column['sortable']) || (isset($column['sortable']) && $column['sortable'])) { $sortableColumns[$key] = $column; } } - */ // 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()); return $this; diff --git a/lib/tablelisting/tablelisting.sslcertificates.php b/lib/tablelisting/tablelisting.sslcertificates.php index e2c830f2..dbea6b1e 100644 --- a/lib/tablelisting/tablelisting.sslcertificates.php +++ b/lib/tablelisting/tablelisting.sslcertificates.php @@ -54,11 +54,13 @@ return [ 'label' => lng('ssl_certificates.valid_from'), 'field' => 'validfromdate', 'searchable' => false, + 'sortable' => false, ], 'c.validtodate' => [ 'label' => lng('ssl_certificates.valid_until'), 'field' => 'validtodate', 'searchable' => false, + 'sortable' => false, ], ], 'visible_columns' => Listing::getVisibleColumnsForListing('sslcertificates_list', [