Merge branch '3.x' of https://github.com/filamentphp/filament into 3.x

filamentphp · Aug 29, 2023 · 94a3046 · 94a3046
2 parents 67ceed6 + 3957b34
commit 94a3046
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/packages/forms/src/Components/MorphToSelect/Type.php b/packages/forms/src/Components/MorphToSelect/Type.php
@@ -63,10 +63,6 @@ protected function setUp(): void
                 ]) ?? $query;
             }
 
-            if (empty($query->getQuery()->orders)) {
-                $query->orderBy($this->getTitleAttribute());
-            }
-
             $isFirst = true;
             $isForcedCaseInsensitive = $this->isSearchForcedCaseInsensitive($query);
 
@@ -113,8 +109,14 @@ protected function setUp(): void
                     ->toArray();
             }
 
+            $titleAttribute = $this->getTitleAttribute();
+
+            if (empty($query->getQuery()->orders)) {
+                $query->orderBy($titleAttribute);
+            }
+
             return $query
-                ->pluck($this->getTitleAttribute(), $keyName)
+                ->pluck($titleAttribute, $keyName)
                 ->toArray();
         });
 
@@ -131,10 +133,6 @@ protected function setUp(): void
                 ]) ?? $query;
             }
 
-            if (empty($query->getQuery()->orders)) {
-                $query->orderBy($this->getTitleAttribute());
-            }
-
             $keyName = $query->getModel()->getKeyName();
 
             if ($this->hasOptionLabelFromRecordUsingCallback()) {
@@ -146,8 +144,14 @@ protected function setUp(): void
                     ->toArray();
             }
 
+            $titleAttribute = $this->getTitleAttribute();
+
+            if (empty($query->getQuery()->orders)) {
+                $query->orderBy($titleAttribute);
+            }
+
             return $query
-                ->pluck($this->getTitleAttribute(), $keyName)
+                ->pluck($titleAttribute, $keyName)
                 ->toArray();
         });