Fix some crashes w/ ManyToMany relationships

outl1ne · Apr 22, 2020 · bf595c9 · bf595c9
1 parent 88bfd2f
commit bf595c9
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Traits/HasSortableRows.php b/src/Traits/HasSortableRows.php
@@ -20,9 +20,12 @@ public static function getSortability(NovaRequest $request)
             $relationshipQuery = $request->findParentModel()->{$request->viaRelationship}();
 
             if (isset($request->resourceId)) {
-                $model = $relationshipQuery->withPivot('id', 'sort_order')->find($request->resourceId)->pivot;
+                $tempModel = $relationshipQuery->first()->pivot ?? null;
+                $model = !empty($tempModel) ?
+                    $relationshipQuery->withPivot($tempModel->getKeyName(), $tempModel->sortable['order_column_name'])->find($request->resourceId)->pivot
+                    : null;
             } else {
-                $model = $relationshipQuery->first()->pivot;
+                $model = $relationshipQuery->first()->pivot ?? null;
             }
 
             $sortable = $model->sortable ?? false;