FIX Gridfiled pagination missing after search

silverstripe · Jun 25, 2023 · 44f2c77 · 44f2c77
1 parent 220fee6
commit 44f2c77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Forms/GridField/GridFieldFilterHeader.php b/src/Forms/GridField/GridFieldFilterHeader.php
@@ -186,7 +186,7 @@ public function getManipulatedData(GridField $gridField, SS_List $dataList)
 
         $dataListClone = clone($dataList);
         $results = $this->getSearchContext($gridField)
-            ->getQuery($filterArguments, false, false, $dataListClone);
+            ->getQuery($filterArguments, false, null, $dataListClone);
 
         return $results;
     }

diff --git a/src/ORM/Search/SearchContext.php b/src/ORM/Search/SearchContext.php
@@ -140,6 +140,7 @@ protected function applyBaseTableFields()
      */
     public function getQuery($searchParams, $sort = false, $limit = false, $existingQuery = null)
     {
+        // @todo In CMS 6 change method param from `$limit = false` to `array|string|null $limit = null`
         $this->setSearchParams($searchParams);
         $query = $this->prepareQuery($sort, $limit, $existingQuery);
         return $this->search($query);
@@ -172,6 +173,9 @@ private function search(DataList $query): DataList
      */
     private function prepareQuery($sort, $limit, ?DataList $existingQuery): DataList
     {
+        if ($limit === false) {
+            $limit = null;
+        }
         $query = null;
         if ($existingQuery) {
             if (!($existingQuery instanceof DataList)) {