Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for API pagination

Browse Source
This commit is contained in:
Hillel Coren 2016-07-17 13:31:31 +03:00
parent 0d58e6da94
commit 59969a4677
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/BaseAPIController.php
View File

@ -139,8 +139,10 @@ class BaseAPIController extends Controller
if (is_a($query, "Illuminate\Database\Eloquent\Builder")) { if (is_a($query, "Illuminate\Database\Eloquent\Builder")) {
$limit = min(MAX_API_PAGE_SIZE, Input::get('per_page', DEFAULT_API_PAGE_SIZE)); $limit = min(MAX_API_PAGE_SIZE, Input::get('per_page', DEFAULT_API_PAGE_SIZE));
$resource = new Collection($query->get(), $transformer, $entityType); $paginator = $query->paginate($limit);
$resource->setPaginator(new IlluminatePaginatorAdapter($query->paginate($limit))); $query = $paginator->getCollection();
$resource = new Collection($query, $transformer, $entityType);
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
} else { } else {
$resource = new Collection($query, $transformer, $entityType); $resource = new Collection($query, $transformer, $entityType);
} }