Merge pull request #87 from yurykabanov/issue-76

Fix pagination used default eloquent's page size (fix #76)
nilportugues · Aug 6, 2016 · b92bbd5 · b92bbd5
2 parents 443012d + a9e7e28
commit b92bbd5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/NilPortugues/Laravel5/JsonApi/Controller/JsonApiTrait.php b/src/NilPortugues/Laravel5/JsonApi/Controller/JsonApiTrait.php
@@ -83,7 +83,7 @@ abstract public function getDataModel();
     protected function listResourceCallable()
     {
         return function () {
-            return EloquentHelper::paginate($this->serializer, $this->getDataModel()->query())->get();
+            return EloquentHelper::paginate($this->serializer, $this->getDataModel()->query(), $this->pageSize)->get();
         };
     }
 

diff --git a/src/NilPortugues/Laravel5/JsonApi/Eloquent/EloquentHelper.php b/src/NilPortugues/Laravel5/JsonApi/Eloquent/EloquentHelper.php
@@ -23,17 +23,18 @@ trait EloquentHelper
     /**
      * @param JsonApiSerializer $serializer
      * @param Builder           $builder
+     * @param int               $pageSize
      *
      * @return Builder
      */
-    public static function paginate(JsonApiSerializer $serializer, Builder $builder)
+    public static function paginate(JsonApiSerializer $serializer, Builder $builder, $pageSize = null)
     {
         self::sort($serializer, $builder, $builder->getModel());
 
         $request = RequestFactory::create();
 
         $builder->paginate(
-            $request->getPage()->size(),
+            $request->getPage()->size() ?: $pageSize,
             self::columns($serializer, $request->getFields()->get()),
             'page',
             $request->getPage()->number()