Merge pull request #2803 from yajra/patch-sorting

yajra · web-flow · commit 69c75b6ae788 · 2022-06-22T17:20:27.000+08:00
[9.x] Fix sorting and pagination on empty records
diff --git a/src/QueryDataTable.php b/src/QueryDataTable.php
@@ -140,9 +140,10 @@ protected function prepareQuery()
 
             if ($this->totalRecords) {
                 $this->filterRecords();
-                $this->ordering();
-                $this->paginate();
             }
+
+            $this->ordering();
+            $this->paginate();
         }
 
         $this->prepared = true;

Original file line number	Diff line number	Diff line change
`@@ -140,9 +140,10 @@ protected function prepareQuery()`
`140`	`140`
`141`	`141`	`if ($this->totalRecords) {`
`142`	`142`	`$this->filterRecords();`
`143`		`- $this->ordering();`
`144`		`- $this->paginate();`
`145`	`143`	`}`
	`144`	`+`
	`145`	`+ $this->ordering();`
	`146`	`+ $this->paginate();`
`146`	`147`	`}`
`147`	`148`
`148`	`149`	`$this->prepared = true;`