From 51eb4b8048ae9ce467cfcbbf2894a9ebdc525210 Mon Sep 17 00:00:00 2001 From: hsangtini Date: Mon, 16 May 2022 18:11:26 +0700 Subject: [PATCH 1/3] Use relatedKey instead of getKey Use relatedKey instead of getKey --- src/AttachMany.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AttachMany.php b/src/AttachMany.php index 0a13101..7acff90 100644 --- a/src/AttachMany.php +++ b/src/AttachMany.php @@ -128,11 +128,11 @@ public function authorize(Request $request) && parent::authorize($request); } - public function formatAssociatableResource(NovaRequest $request, $resource) + public function formatAssociatableResource(NovaRequest $request, $resource, $parentModel, $relationship) { $item = [ 'display' => $this->formatDisplayValue($resource), - 'value' => $resource->getKey(), + 'value' => $resource->{$parentModel->$relationship()->getRelatedKeyName()}, ]; if($this->showSubtitle) { From ba9ded8f0490bda105e0f8ca07f6f43b661c5469 Mon Sep 17 00:00:00 2001 From: hsangtini Date: Mon, 16 May 2022 18:12:27 +0700 Subject: [PATCH 2/3] Use relatedKey instead of getKey Use relatedKey instead of getKey --- src/Http/Controllers/AttachController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Http/Controllers/AttachController.php b/src/Http/Controllers/AttachController.php index d505e52..3dc73fa 100644 --- a/src/Http/Controllers/AttachController.php +++ b/src/Http/Controllers/AttachController.php @@ -47,8 +47,8 @@ public function getAvailableResources($request, $relationship) ->mapInto($field->resourceClass) ->filter(function ($resource) use ($request, $field) { return $request->newResource()->authorizedToAttach($request, $resource->resource); - })->map(function ($resource) use ($request, $field) { - return $field->formatAssociatableResource($request, $resource); + })->map(function ($resource) use ($request, $field, $resourceClass, $relationship) { + return $field->formatAssociatableResource($request, $resource, $resourceClass->newModel(), $relationship); })->values(); } From b625ba1c13d009a7ac2acc0f75d49379f0ea5256 Mon Sep 17 00:00:00 2001 From: hsangtini Date: Mon, 16 May 2022 18:40:57 +0700 Subject: [PATCH 3/3] Use relatedKey instead of getKey --- src/Http/Controllers/AttachController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/Controllers/AttachController.php b/src/Http/Controllers/AttachController.php index 3dc73fa..d573730 100644 --- a/src/Http/Controllers/AttachController.php +++ b/src/Http/Controllers/AttachController.php @@ -23,7 +23,7 @@ public function edit(NovaRequest $request, $parent, $parentId, $relationship) abort(500, class_basename($foundResource->model()) . " is missing relationship: $relationship"); } - $keyName = $foundResource->model()->{$relationship}()->getModel()->getKeyName(); + $keyName = $foundResource->model()->{$relationship}()->getRelatedKeyName(); return [ 'selected' => $foundResource->model()->{$relationship}->pluck($keyName),