From b26fbf986f4895fc49aac2071fd765d8c79cc7c7 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 14 Feb 2019 14:49:08 -0800 Subject: [PATCH] =?UTF-8?q?Fixed=20issue=20where=20offset=20could=20be=20g?= =?UTF-8?q?reater=20than=20total=20items,=20resulting=20in=20=E2=80=9CNo?= =?UTF-8?q?=20results=E2=80=9D=20confusion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/AccessoriesController.php | 2 +- app/Http/Controllers/Api/AssetMaintenancesController.php | 2 +- app/Http/Controllers/Api/AssetModelsController.php | 2 +- app/Http/Controllers/Api/AssetsController.php | 2 +- app/Http/Controllers/Api/CategoriesController.php | 2 +- app/Http/Controllers/Api/CompaniesController.php | 2 +- app/Http/Controllers/Api/ComponentsController.php | 2 +- app/Http/Controllers/Api/DepartmentsController.php | 2 +- app/Http/Controllers/Api/DepreciationsController.php | 2 +- app/Http/Controllers/Api/GroupsController.php | 2 +- app/Http/Controllers/Api/LicensesController.php | 2 +- app/Http/Controllers/Api/LocationsController.php | 2 +- app/Http/Controllers/Api/ManufacturersController.php | 2 +- app/Http/Controllers/Api/StatuslabelsController.php | 2 +- app/Http/Controllers/Api/SuppliersController.php | 2 +- app/Http/Controllers/Api/UsersController.php | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php index fcdc52d21..794c0333c 100644 --- a/app/Http/Controllers/Api/AccessoriesController.php +++ b/app/Http/Controllers/Api/AccessoriesController.php @@ -46,7 +46,7 @@ class AccessoriesController extends Controller $accessories->where('supplier_id','=',$request->input('supplier_id')); } - $offset = $request->input('offset', 0); + $offset = (($accessories) && (request('offset') > $accessories->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/AssetMaintenancesController.php b/app/Http/Controllers/Api/AssetMaintenancesController.php index 682d3d2db..fd7b40177 100644 --- a/app/Http/Controllers/Api/AssetMaintenancesController.php +++ b/app/Http/Controllers/Api/AssetMaintenancesController.php @@ -44,7 +44,7 @@ class AssetMaintenancesController extends Controller $maintenances->where('asset_id', '=', $request->input('asset_id')); } - $offset = request('offset', 0); + $offset = (($maintenances) && (request('offset') > $maintenances->count())) ? 0 : request('offset', 0); $limit = request('limit', 50); $allowed_columns = [ diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index 1d9d9c4d4..852c38e2c 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -60,7 +60,7 @@ class AssetModelsController extends Controller $assetmodels->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($assetmodels) && (request('offset') > $assetmodels->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'models.created_at'; diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 6dfe6b991..c91c57ab7 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -144,7 +144,7 @@ class AssetsController extends Controller $request->has('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : ''; - $offset = request('offset', 0); + $offset = (($assets) && (request('offset') > $assets->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index 190b6f248..c42dc7ebf 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -30,7 +30,7 @@ class CategoriesController extends Controller $categories = $categories->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($categories) && (request('offset') > $categories->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets_count'; diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php index c960561b4..e5264d8e6 100644 --- a/app/Http/Controllers/Api/CompaniesController.php +++ b/app/Http/Controllers/Api/CompaniesController.php @@ -41,7 +41,7 @@ class CompaniesController extends Controller $companies->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($companies) && (request('offset') > $companies->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php index 987d30da2..8f1accf64 100644 --- a/app/Http/Controllers/Api/ComponentsController.php +++ b/app/Http/Controllers/Api/ComponentsController.php @@ -43,7 +43,7 @@ class ComponentsController extends Controller $components->where('location_id','=',$request->input('location_id')); } - $offset = request('offset', 0); + $offset = (($components) && (request('offset') > $components->count())) ? 0 : request('offset', 0); $limit = request('limit', 50); $allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','company','category','qty','location','image']; diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php index ab2132707..a6fa3155a 100644 --- a/app/Http/Controllers/Api/DepartmentsController.php +++ b/app/Http/Controllers/Api/DepartmentsController.php @@ -39,7 +39,7 @@ class DepartmentsController extends Controller $departments = $departments->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($departments) && (request('offset') > $departments->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/DepreciationsController.php b/app/Http/Controllers/Api/DepreciationsController.php index 20e18baf4..47e2c8de5 100644 --- a/app/Http/Controllers/Api/DepreciationsController.php +++ b/app/Http/Controllers/Api/DepreciationsController.php @@ -28,7 +28,7 @@ class DepreciationsController extends Controller $depreciations = $depreciations->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($depreciations) && (request('offset') > $depreciations->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php index e4839b27e..a213c0173 100644 --- a/app/Http/Controllers/Api/GroupsController.php +++ b/app/Http/Controllers/Api/GroupsController.php @@ -28,7 +28,7 @@ class GroupsController extends Controller $groups = $groups->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($groups) && (request('offset') > $groups->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php index af6820868..82ab0fc2b 100644 --- a/app/Http/Controllers/Api/LicensesController.php +++ b/app/Http/Controllers/Api/LicensesController.php @@ -82,7 +82,7 @@ class LicensesController extends Controller } - $offset = request('offset', 0); + $offset = (($licenses) && (request('offset') > $licenses->count())) ? 0 : request('offset', 0); $limit = request('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php index dd4133010..f448dd167 100644 --- a/app/Http/Controllers/Api/LocationsController.php +++ b/app/Http/Controllers/Api/LocationsController.php @@ -51,7 +51,7 @@ class LocationsController extends Controller - $offset = $request->input('offset', 0); + $offset = (($locations) && (request('offset') > $locations->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php index 466c0858f..64f288e49 100644 --- a/app/Http/Controllers/Api/ManufacturersController.php +++ b/app/Http/Controllers/Api/ManufacturersController.php @@ -39,7 +39,7 @@ class ManufacturersController extends Controller - $offset = request('offset', 0); + $offset = (($manufacturers) && (request('offset') > $manufacturers->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php index dce204e02..6238b5889 100644 --- a/app/Http/Controllers/Api/StatuslabelsController.php +++ b/app/Http/Controllers/Api/StatuslabelsController.php @@ -30,7 +30,7 @@ class StatuslabelsController extends Controller $statuslabels = $statuslabels->TextSearch($request->input('search')); } - $offset = $request->input('offset', 0); + $offset = (($statuslabels) && (request('offset') > $statuslabels->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php index 27cee1521..08d43517e 100644 --- a/app/Http/Controllers/Api/SuppliersController.php +++ b/app/Http/Controllers/Api/SuppliersController.php @@ -33,7 +33,7 @@ class SuppliersController extends Controller $suppliers = $suppliers->TextSearch($request->input('search')); } - $offset = request('offset', 0); + $offset = (($suppliers) && (request('offset') > $suppliers->count())) ? 0 : request('offset', 0); $limit = $request->input('limit', 50); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at'; diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 5bd825d95..cdf4d3be6 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -85,7 +85,7 @@ class UsersController extends Controller } $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; - $offset = request('offset', 0); + $offset = (($users) && (request('offset') > $users->count())) ? 0 : request('offset', 0); $limit = request('limit', 20); switch ($request->input('sort')) {