Merge pull request #1 from morphsteve/fix-first-last

Determine first and last resource correctly for customised sort queries.
michielkempen · Sep 20, 2018 · b845a23 · b845a23
2 parents 6f365a5 + e9be981
commit b845a23
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/OrderField.php b/src/OrderField.php
@@ -37,10 +37,8 @@ class OrderField extends Field
      */
     protected function resolveAttribute($resource, $attribute)
     {
-        $orderField = $resource->sortable['order_column_name'];
-
-        $first = $resource->newQuery()->orderBy($orderField, 'asc')->first();
-        $last = $resource->newQuery()->orderBy($orderField, 'desc')->first();
+        $first = $resource->buildSortQuery()->ordered()->first();
+        $last = $resource->buildSortQuery()->ordered('desc')->first();
 
         $this->withMeta([
             'first' => is_null($first) ? null : $first->id,