Skip to content

Commit 4e3d570

Browse files
committed
Use singleton for offset
Signed-off-by: snipe <[email protected]>
1 parent 37858d8 commit 4e3d570

18 files changed

+30
-17
lines changed

app/Http/Controllers/Api/AssetsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public function index(Request $request, $audit = null)
346346

347347

348348
// Make sure the offset and limit are actually integers and do not exceed system limits
349-
$offset = ($request->input('offset') > $assets->count()) ? $assets->count() : abs($request->input('offset'));
349+
$offset = ($request->input('offset') > $assets->count()) ? $assets->count() : app('api_offset_value');
350350
$limit = app('api_limit_value');
351351

352352
$total = $assets->count();

app/Http/Controllers/Api/CategoriesController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function index(Request $request)
9292
}
9393

9494
// Make sure the offset and limit are actually integers and do not exceed system limits
95-
$offset = ($request->input('offset') > $categories->count()) ? $categories->count() : abs($request->input('offset'));
95+
$offset = ($request->input('offset') > $categories->count()) ? $categories->count() : app('api_offset_value');
9696
$limit = app('api_limit_value');
9797

9898
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/CompaniesController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function index(Request $request)
5656

5757

5858
// Make sure the offset and limit are actually integers and do not exceed system limits
59-
$offset = ($request->input('offset') > $companies->count()) ? $companies->count() : abs($request->input('offset'));
59+
$offset = ($request->input('offset') > $companies->count()) ? $companies->count() : app('api_offset_value');
6060
$limit = app('api_limit_value');
6161

6262

app/Http/Controllers/Api/ComponentsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function index(Request $request)
7777
}
7878

7979
// Make sure the offset and limit are actually integers and do not exceed system limits
80-
$offset = ($request->input('offset') > $components->count()) ? $components->count() : abs($request->input('offset'));
80+
$offset = ($request->input('offset') > $components->count()) ? $components->count() : app('api_offset_value');
8181
$limit = app('api_limit_value');
8282

8383
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/ConsumablesController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function index(Request $request)
8686

8787

8888
// Make sure the offset and limit are actually integers and do not exceed system limits
89-
$offset = ($request->input('offset') > $consumables->count()) ? $consumables->count() : abs($request->input('offset'));
89+
$offset = ($request->input('offset') > $consumables->count()) ? $consumables->count() : app('api_offset_value');
9090
$limit = app('api_limit_value');
9191

9292
$allowed_columns = ['id', 'name', 'order_number', 'min_amt', 'purchase_date', 'purchase_cost', 'company', 'category', 'model_number', 'item_no', 'manufacturer', 'location', 'qty', 'image'];

app/Http/Controllers/Api/DepartmentsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function index(Request $request)
6161
}
6262

6363
// Make sure the offset and limit are actually integers and do not exceed system limits
64-
$offset = ($request->input('offset') > $departments->count()) ? $departments->count() : abs($request->input('offset'));
64+
$offset = ($request->input('offset') > $departments->count()) ? $departments->count() : app('api_offset_value');
6565
$limit = app('api_limit_value');
6666

6767
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/DepreciationsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function index(Request $request)
2929
}
3030

3131
// Make sure the offset and limit are actually integers and do not exceed system limits
32-
$offset = ($request->input('offset') > $depreciations->count()) ? $depreciations->count() : abs($request->input('offset'));
32+
$offset = ($request->input('offset') > $depreciations->count()) ? $depreciations->count() : app('api_offset_value');
3333
$limit = app('api_limit_value');
3434

3535
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/GroupsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function index(Request $request)
3636
}
3737

3838
// Make sure the offset and limit are actually integers and do not exceed system limits
39-
$offset = ($request->input('offset') > $groups->count()) ? $groups->count() : abs($request->input('offset'));
39+
$offset = ($request->input('offset') > $groups->count()) ? $groups->count() : app('api_offset_value');
4040
$limit = app('api_limit_value');
4141

4242
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/LicenseSeatsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function index(Request $request, $licenseId)
4141
$total = $seats->count();
4242

4343
// Make sure the offset and limit are actually integers and do not exceed system limits
44-
$offset = ($request->input('offset') > $seats->count()) ? $seats->count() : abs($request->input('offset'));
44+
$offset = ($request->input('offset') > $seats->count()) ? $seats->count() : app('api_offset_value');
4545

4646
if ($offset >= $total ){
4747
$offset = 0;

app/Http/Controllers/Api/LicensesController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function index(Request $request)
9595
}
9696

9797
// Make sure the offset and limit are actually integers and do not exceed system limits
98-
$offset = ($request->input('offset') > $licenses->count()) ? $licenses->count() : abs($request->input('offset'));
98+
$offset = ($request->input('offset') > $licenses->count()) ? $licenses->count() : app('api_offset_value');
9999
$limit = app('api_limit_value');
100100

101101
$order = $request->input('order') === 'asc' ? 'asc' : 'desc';

0 commit comments

Comments
 (0)