DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Account for limit if none is passed in the request

Browse source
This commit is contained in:
snipe 2019-09-03 20:28:49 -07:00
parent c256536d21
commit c68c0e1208
17 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/AccessoriesController.php
View file

@ -52,7 +52,7 @@ class AccessoriesController extends Controller
$offset = (($accessories) && (request('offset') > $accessories->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

2
app/Http/Controllers/Api/AssetMaintenancesController.php
View file

@ -47,7 +47,7 @@ class AssetMaintenancesController extends Controller
$offset = (($maintenances) && (request('offset') > $maintenances->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$allowed_columns = [

2
app/Http/Controllers/Api/AssetModelsController.php
View file

@ -63,7 +63,7 @@ class AssetModelsController extends Controller
$offset = (($assetmodels) && (request('offset') > $assetmodels->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') < $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'models.created_at';

2
app/Http/Controllers/Api/AssetsController.php
View file

@ -147,7 +147,7 @@ class AssetsController extends Controller
$offset = (($assets) && (request('offset') > $assets->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

2
app/Http/Controllers/Api/CategoriesController.php
View file

@ -33,7 +33,7 @@ class CategoriesController extends Controller
$offset = (($categories) && (request('offset') > $categories->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets_count';

2
app/Http/Controllers/Api/CompaniesController.php
View file

@ -44,7 +44,7 @@ class CompaniesController extends Controller
$offset = (($companies) && (request('offset') > $companies->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

2
app/Http/Controllers/Api/ComponentsController.php
View file

@ -46,7 +46,7 @@ class ComponentsController extends Controller
$offset = (($components) && (request('offset') > $components->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','company','category','qty','location','image'];
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

2
app/Http/Controllers/Api/ConsumablesController.php
View file

@ -47,7 +47,7 @@ class ConsumablesController extends Controller
$offset = (($consumables) && (request('offset') > $consumables->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$allowed_columns = ['id','name','order_number','min_amt','purchase_date','purchase_cost','company','category','model_number', 'item_no', 'manufacturer','location','qty','image'];
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

2
app/Http/Controllers/Api/DepartmentsController.php
View file

@ -42,7 +42,7 @@ class DepartmentsController extends Controller
$offset = (($departments) && (request('offset') > $departments->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

2
app/Http/Controllers/Api/DepreciationsController.php
View file

@ -31,7 +31,7 @@ class DepreciationsController extends Controller
$offset = (($depreciations) && (request('offset') > $depreciations->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

2
app/Http/Controllers/Api/GroupsController.php
View file

@ -31,7 +31,7 @@ class GroupsController extends Controller
$offset = (($groups) && (request('offset') > $groups->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

2
app/Http/Controllers/Api/LicensesController.php
View file

@ -85,7 +85,7 @@ class LicensesController extends Controller
$offset = (($licenses) && (request('offset') > $licenses->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

2
app/Http/Controllers/Api/LocationsController.php
View file

@ -54,7 +54,7 @@ class LocationsController extends Controller
$offset = (($locations) && (request('offset') > $locations->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

2
app/Http/Controllers/Api/ManufacturersController.php
View file

@ -42,7 +42,7 @@ class ManufacturersController extends Controller
$offset = (($manufacturers) && (request('offset') > $manufacturers->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

2
app/Http/Controllers/Api/StatuslabelsController.php
View file

@ -33,7 +33,7 @@ class StatuslabelsController extends Controller
$offset = (($statuslabels) && (request('offset') > $statuslabels->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

2
app/Http/Controllers/Api/SuppliersController.php
View file

@ -36,7 +36,7 @@ class SuppliersController extends Controller
$offset = (($suppliers) && (request('offset') > $suppliers->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

2
app/Http/Controllers/Api/UsersController.php
View file

@ -90,7 +90,7 @@ class UsersController extends Controller
$offset = (($users) && (request('offset') > $users->count())) ? 0 : request('offset', 0);
// Check to make sure the limit is not higher than the max allowed
(config('app.max_results') >= $request->input('limit')) ? $limit = $request->input('limit') : $limit = config('app.max_results');
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
switch ($request->input('sort')) {