fix relatable query

conedevelopment · Feb 13, 2024 · f2e58b6 · f2e58b6
1 parent 69865c8
commit f2e58b6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Fields/Relation.php b/src/Fields/Relation.php
@@ -405,7 +405,11 @@ public function withRelatableQuery(Closure $callback): static
      */
     public function resolveRelatableQuery(Request $request, Model $model): Builder
     {
-        $query = $this->getRelation($model)->getRelated()->newQuery();
+        $query = $this->getRelation($model)
+            ->getRelated()
+            ->newQuery()
+            ->with($this->with)
+            ->withCount($this->withCount);
 
         foreach (static::$scopes[static::class] ?? [] as $scope) {
             $query = call_user_func_array($scope, [$request, $query, $model]);
@@ -511,9 +515,7 @@ public function paginate(Request $request, Model $model): LengthAwarePaginator
         $relation = $this->getRelation($model);
 
         return $this->resolveFilters($request)
-            ->apply($request, $relation->getQuery())
-            ->with($this->with)
-            ->withCount($this->withCount)
+            ->apply($request, $this->resolveRelatableQuery($request, $model))
             ->latest()
             ->paginate($request->input($this->getPerPageKey(), $request->isTurboFrameRequest() ? 5 : $relation->getRelated()->getPerPage()))
             ->withQueryString();