fix sort

kibatic · Jul 28, 2022 · c3a113d · c3a113d
1 parent 2f846b6
commit c3a113d
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/Grid/GridBuilder.php b/src/Grid/GridBuilder.php
@@ -80,20 +80,14 @@ public function addFilter(string $formFieldName, callable $callback): self
 
     private function applySort()
     {
-        foreach ($this->columns as $column) {
-            if ($column->sortable === null) {
-                continue;
-            }
-
-            $sortBy = $this->request->get('sort_by');
-            $direction = $this->request->get('sort_order', 'ASC');
-
-            if ($sortBy === null) {
-                continue;
-            }
+        $sortBy = $this->request->get('sort_by');
+        $direction = $this->request->get('sort_order', 'ASC');
 
-            $this->queryBuilder->orderBy($column->sortable, $direction);
+        if ($sortBy === null) {
+            return;
         }
+
+        $this->queryBuilder->orderBy($sortBy, $direction);
     }
 
     private function applyFilters()