QueryBuilder upgrade

TypiCMS · Sep 4, 2019 · 2915aa0 · 2915aa0
1 parent 25fa07b
commit 2915aa0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Http/Controllers/ApiController.php b/src/Http/Controllers/ApiController.php
@@ -6,7 +6,7 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
-use Spatie\QueryBuilder\Filter;
+use Spatie\QueryBuilder\AllowedFilter;
 use Spatie\QueryBuilder\QueryBuilder;
 use TypiCMS\Modules\Core\Filters\FilterOr;
 use TypiCMS\Modules\Core\Http\Controllers\BaseApiController;
@@ -18,11 +18,12 @@ class ApiController extends BaseApiController
     public function index(Request $request): LengthAwarePaginator
     {
         $data = QueryBuilder::for(Place::class)
+            ->selectFields($request->input('fields.places'))
+            ->allowedSorts(['id', 'status_translated', 'title_translated'])
             ->allowedFilters([
-                Filter::custom('title', FilterOr::class),
+                AllowedFilter::custom('title', new FilterOr),
             ])
-            ->allowedIncludes('image')
-            ->translated($request->input('translatable_fields'))
+            ->allowedIncludes(['image'])
             ->paginate($request->input('per_page'));
 
         return $data;

diff --git a/src/resources/views/admin/index.blade.php b/src/resources/views/admin/index.blade.php
@@ -7,8 +7,7 @@
 <item-list
     url-base="/api/places"
     locale="{{ config('typicms.content_locale') }}"
-    fields="id,image_id,address"
-    translatable-fields="status,title"
+    fields="id,image_id,address,status,title"
     table="places"
     title="places"
     include="image"