Unverified Commit c0966a95 authored by Stas's avatar Stas Committed by GitHub

Merge pull request #1959 from Giacomo92/pr_1145

[Updated PR#1145] Fix paginate in EmbedsMany
parents 89fe91f7 70c72634
...@@ -265,25 +265,36 @@ class EmbedsMany extends EmbedsOneOrMany ...@@ -265,25 +265,36 @@ class EmbedsMany extends EmbedsOneOrMany
} }
/** /**
* Get a paginator for the "select" statement. * @param null $perPage
* @param int $perPage * @param array $columns
* @return \Illuminate\Pagination\AbstractPaginator * @param string $pageName
* @param null $page
* @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
*/ */
public function paginate($perPage = null) public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null)
{ {
$page = Paginator::resolveCurrentPage(); $page = $page ?: Paginator::resolveCurrentPage($pageName);
$perPage = $perPage ?: $this->related->getPerPage(); $perPage = $perPage ?: $this->related->getPerPage();
$results = $this->getEmbedded(); $results = $this->getEmbedded();
$results = $this->toCollection($results);
$total = count($results); $total = $results->count();
$start = ($page - 1) * $perPage; $start = ($page - 1) * $perPage;
$sliced = array_slice($results, $start, $perPage);
return new LengthAwarePaginator($sliced, $total, $perPage, $page, [ $sliced = $results->slice(
'path' => Paginator::resolveCurrentPath(), $start,
]); $perPage
);
return new LengthAwarePaginator(
$sliced,
$total,
$perPage,
$page,
[
'path' => Paginator::resolveCurrentPath()
]
);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment