diff --git a/src/Controllers/Api/Nasa/V1/Base/ListController.php b/src/Controllers/Api/Nasa/V1/Base/ListController.php index dd14c91c1..608b94219 100755 --- a/src/Controllers/Api/Nasa/V1/Base/ListController.php +++ b/src/Controllers/Api/Nasa/V1/Base/ListController.php @@ -70,6 +70,8 @@ abstract class ListController $oQuery = $this->oModel->newQuery(); $aParams = $oRequest->getParams(); + $iLimit = $aParams['limit'] ?? $this->iLimit; + $iPage = $aParams['page'] ?? 1; foreach ($aParams as $k => $v) { @@ -134,7 +136,7 @@ abstract class ListController } - $iLimit = (int) $oRequest->getParam('limit', $this->iLimit); + $iLimit = max(1, $iLimit); $iLimit = min($this->iLimitMax, $iLimit); @@ -146,7 +148,13 @@ abstract class ListController $oQuery->orderBy($aOrderBy['sField'], $aOrderBy['sSort']); } - $oPaginatedData = $oQuery->paginate($iLimit, array_keys($this->aListFields)); +// $oPaginatedData = $oQuery->paginate($iLimit, array_keys($this->aListFields)); + $oPaginatedData = $oQuery->paginate( + $iLimit, + array_keys($this->aListFields), + 'page', + $iPage + ); return $oResponse->withJson([ 'iCode' => 200,