Fix global search not working

outl1ne · Apr 23, 2020 · ab8b388 · ab8b388
1 parent 801b7f2
commit ab8b388
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/src/Traits/HasSortableRows.php b/src/Traits/HasSortableRows.php
@@ -10,7 +10,12 @@ public static function getSortability(NovaRequest $request)
     {
         $model = null;
 
-        $resource = isset($request->resourceId) ? $request->findResourceOrFail() : $request->newResource();
+        try {
+            $resource = isset($request->resourceId) ? $request->findResourceOrFail() : $request->newResource();
+        } catch (\Exception $e) {
+            return null;
+        }
+
         $model = $resource->resource ?? null;
 
         $sortable = $model->sortable ?? false;
@@ -58,15 +63,17 @@ public static function indexQuery(NovaRequest $request, $query)
     {
         $sortability = static::getSortability($request);
 
-        $shouldSort = true;
-        if (empty($sortability->sortable)) $shouldSort = false;
-        if ($sortability->sortOnBelongsTo && empty($request->viaResource())) $shouldSort = false;
-        if ($sortability->sortOnHasMany && empty($request->viaResource())) $shouldSort = false;
+        if (!empty($sortability)) {
+            $shouldSort = true;
+            if (empty($sortability->sortable)) $shouldSort = false;
+            if ($sortability->sortOnBelongsTo && empty($request->viaResource())) $shouldSort = false;
+            if ($sortability->sortOnHasMany && empty($request->viaResource())) $shouldSort = false;
 
-        if (empty($request->get('orderBy')) && $shouldSort) {
-            $query->getQuery()->orders = [];
-            $orderColumn = !empty($sortability->sortable['order_column_name']) ? $sortability->sortable['order_column_name'] : 'sort_order';
-            return $query->orderBy($orderColumn);
+            if (empty($request->get('orderBy')) && $shouldSort) {
+                $query->getQuery()->orders = [];
+                $orderColumn = !empty($sortability->sortable['order_column_name']) ? $sortability->sortable['order_column_name'] : 'sort_order';
+                return $query->orderBy($orderColumn);
+            }
         }
 
         return $query;