Merge Children paginate property when needed

chialab · Jun 11, 2024 · 6127888 · 6127888
1 parent 2e41bf5
commit 6127888
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Traits/GenericActionsTrait.php b/src/Traits/GenericActionsTrait.php
@@ -93,17 +93,20 @@ protected function loadFilteredChildren(Folder $folder): array
 
         $children = $this->Objects->loadRelatedObjects($folder['uname'], 'folders', 'children', $this->Filters->fromQuery());
 
-        return $this->paginate(
-            $children->order([], true),
-            Hash::merge($this->paginate, [
-                'order' => $order,
-                'sortableFields' => array_merge($this->paginate['sortableFields'] ?? (array)$this->request->getQuery('sort'), array_keys($order)),
+        $settings = Hash::merge($this->paginate, [
+            'order' => $order,
+            'sortableFields' => array_merge($this->paginate['sortableFields'] ?? (array)$this->request->getQuery('sort'), array_keys($order)),
+        ]);
+        if (isset($settings['Children'])) {
+            $settings = Hash::merge($settings, [
                 'Children' => [
                     'order' => $order,
                     'sortableFields' => array_merge($this->paginate['Children']['sortableFields'] ?? (array)$this->request->getQuery('sort'), array_keys($order)),
                 ],
-            ]),
-        )->toList();
+            ]);
+        }
+
+        return $this->paginate($children->order([], true), $settings)->toList();
     }
 
     /**