Add missing relationship error message

dillingham · Dec 28, 2020 · 0d02e3b · 0d02e3b
1 parent 58fc969
commit 0d02e3b
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/Http/Controllers/AttachController.php b/src/Http/Controllers/AttachController.php
@@ -17,18 +17,14 @@ public function create(NovaRequest $request, $parent, $relationship)
 
     public function edit(NovaRequest $request, $parent, $parentId, $relationship)
     {
-        // lookup the resource
         $foundResource = $request->findResourceOrFail();
 
-        // if the $relationship() method exists, we will use that to
-        // determine the keyName
-        if(method_exists($foundResource->model(), $relationship)){
-            $keyName = $foundResource->model()->{$relationship}()->getModel()->getKeyName();
-            // otherwise default to an assumed keyName of `id`
-        }else{
-            $keyName = 'id';
+        if(! method_exists($foundResource->model(), $relationship)) {
+            abort(500, class_basename($foundResource->model()) . " is missing relationship: $relationship");
         }
 
+        $keyName = $foundResource->model()->{$relationship}()->getModel()->getKeyName();
+
         return [
             'selected' => $foundResource->model()->{$relationship}->pluck($keyName),
             'available' => $this->getAvailableResources($request, $relationship),
@@ -55,7 +51,7 @@ public function getAvailableResources($request, $relationship)
                 return $field->formatAssociatableResource($request, $resource);
             })->sortBy('display')->values();
     }
-    
+
     /**
      * Get the associatable query method name.
      *