|
|
@@ -168,7 +168,7 @@ class EloquentRepository extends Repository implements TreeRepository
|
|
|
}
|
|
|
|
|
|
$model->getQueries()->unique()->each(function ($value) use (&$query) {
|
|
|
- if ($value['method'] === 'paginate') {
|
|
|
+ if ($value['method'] === 'paginate' || $value['method'] === 'simplePaginate') {
|
|
|
$value['arguments'][1] = $this->getGridColumns();
|
|
|
} elseif ($value['method'] === 'get') {
|
|
|
$value['arguments'] = [$this->getGridColumns()];
|
|
|
@@ -370,14 +370,16 @@ class EloquentRepository extends Repository implements TreeRepository
|
|
|
*/
|
|
|
protected function setPaginate(Grid\Model $model)
|
|
|
{
|
|
|
- $paginate = $model->findQueryByMethod('paginate')->first();
|
|
|
+ $paginateMethod = $model->getPaginateMethod();
|
|
|
|
|
|
- $model->rejectQuery(['paginate']);
|
|
|
+ $paginate = $model->findQueryByMethod($paginateMethod)->first();
|
|
|
+
|
|
|
+ $model->rejectQuery(['paginate', 'simplePaginate']);
|
|
|
|
|
|
if (! $model->allowPagination()) {
|
|
|
$model->addQuery('get', [$this->getGridColumns()]);
|
|
|
} else {
|
|
|
- $model->addQuery('paginate', $this->resolvePerPage($model, $paginate));
|
|
|
+ $model->addQuery($paginateMethod, $this->resolvePerPage($model, $paginate));
|
|
|
}
|
|
|
}
|
|
|
|