Merge pull request #68 from chialab/fix-ordering-2

chore: clean code
chialab · Jan 4, 2023 · 218c2ed · 218c2ed
2 parents 8c5b63a + 5f2bad2
commit 218c2ed
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Traits/GenericActionsTrait.php b/src/Traits/GenericActionsTrait.php
@@ -67,9 +67,12 @@ protected function loadFilteredChildren(Folder $folder): array
             $order = ['Trees.tree_left'];
         }
 
+        $sortAllowlist = $this->paginate['sortWhitelist'] ?? (array)$this->request->getQuery('sort');
+        $this->paginate['sortWhitelist'] = array_merge($sortAllowlist, array_keys($order));
+
         $children = $this->Objects->loadRelatedObjects($folder['uname'], 'folders', 'children', $this->Filters->fromQuery());
 
-        return $this->paginate($children, ['order' => $order])->toList();
+        return $this->paginate($children->order([], true), ['order' => $order])->toList();
     }
 
     /**