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

…109)
orlyapps · Feb 21, 2022 · 9165ca6 · 9165ca6
1 parent a5d9ba0
commit 9165ca6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/NovaBelongsToDepend.php b/src/NovaBelongsToDepend.php
@@ -135,7 +135,12 @@ public function resolve($resource, $attribute = null)
         $foreign = $resource->{$this->attribute}();
         $this->foreignKeyName = $foreign->getForeignKeyName();
 
-        $value = $resource->{$this->attribute}()->withoutGlobalScopes()->first();
+        if ($resource->relationLoaded($this->attribute)) {
+            $value = $resource->getRelation($this->attribute);
+        } else {
+            $value = $resource->{$this->attribute}()->withoutGlobalScopes()->first();
+        }
+
         if ($value) {
             $this->valueKey = $value->getKey();
             $this->value = $this->formatDisplayValue($value);