diff --git a/src/Filters/MatchesCollection.php b/src/Filters/MatchesCollection.php index e94d74d5d..901943c13 100644 --- a/src/Filters/MatchesCollection.php +++ b/src/Filters/MatchesCollection.php @@ -66,8 +66,8 @@ public function inQuery(RestifyRequest $request): self } } - return ! is_null($request->input("-{$filter->column()}")) - || ! is_null($request->input($filter->column())); + return ! is_null($request->query("-{$filter->column()}")) + || ! is_null($request->query($filter->column())); }); } diff --git a/src/Repositories/Repository.php b/src/Repositories/Repository.php index 91c86da50..a8521f699 100644 --- a/src/Repositories/Repository.php +++ b/src/Repositories/Repository.php @@ -532,7 +532,7 @@ public function resolveIndexRelationships($request) return $this->resolveRelationships($request); } - public function index(RestifyRequest $request, bool $toArray = false) + public function index(RestifyRequest $request) { // Check if the user has the policy allowRestify @@ -588,10 +588,6 @@ public function index(RestifyRequest $request, bool $toArray = false) 'data' => $data, ]); - if ($toArray) { - return $result; - } - return response()->json($result); }