Check if attribute relation is loaded when resolving attribute value (#…

…86)
orlyapps · Apr 12, 2021 · 69a23f7 · 69a23f7
1 parent 8423628
commit 69a23f7
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/NovaBelongsToDepend.php b/src/NovaBelongsToDepend.php
@@ -135,8 +135,15 @@ public function resolve($resource, $attribute = null)
             $this->dependKey = $resource->{$this->dependsOn}()->getForeignKeyName();
         }
 
-        $value = $resource->{$this->attribute}()->withoutGlobalScopes()->first();
-        if ($value) {
+        if ($resource->relationLoaded($this->attribute)) {
+            $value = $resource->getRelation($this->attribute);
+        }
+
+        if (empty($value)) {
+            $value = $resource->{$this->attribute}()->withoutGlobalScopes()->getResults();
+        }
+
+        if (!empty($value)) {
             $this->valueKey = $value->getKey();
             $this->value = $this->formatDisplayValue($value);
         }