Skip to content
Snippets Groups Projects
Commit d92de0a0 authored by Nicholas Stees's avatar Nicholas Stees Committed by Rajab Natshah
Browse files

Issue #3316835 by NicholasS: Fix pagination and sorting for latest release...

Issue #3316835 by NicholasS: Fix pagination and sorting for latest release which was not applied with Drupal ~10
parent 995519b8
No related branches found
No related tags found
1 merge request!9Issue #3316835 by NicholasS: Fix pagination and sorting for latest release which was not applied with Drupal ~10
......@@ -26,16 +26,10 @@ class AdminAuditTrailStorage {
*/
public static function getSearchData(array $getData, array $header, $limit = NULL) {
$query = Database::getConnection()->select('admin_audit_trail', 'e');
$query->fields('e');
/** @var \Drupal\Core\Database\Query\TableSortExtender $query */
$query->extend(TableSortExtender::class)
->orderByHeader($header);
/** @var \Drupal\Core\Database\Query\PagerSelectExtender $query */
$query->extend(PagerSelectExtender::class)
->limit($limit);
$query = Database::getConnection()->select('admin_audit_trail', 'e')->extend(TableSortExtender::class)->extend(PagerSelectExtender::class);
$query->fields('e');
// Apply filters.
if (!empty($getData['type'])) {
......@@ -62,7 +56,7 @@ class AdminAuditTrailStorage {
if (!empty($getData['user'])) {
$query->condition('uid', $getData['user']);
}
$result = $query->execute();
$result = $query->orderByHeader($header)->limit($limit)->execute();
return $result;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment