Skip to content

A free open source IT asset/license management system

Pint

snipef275cb6928ae
diff --git a/app/Http/Transformers/DatatablesTransformer.php b/app/Http/Transformers/DatatablesTransformer.php
index 85414fd13b..a5639931e2 100644
--- a/app/Http/Transformers/DatatablesTransformer.php
+++ b/app/Http/Transformers/DatatablesTransformer.php
@@ -11,7 +11,7 @@ class DatatablesTransformer
{
$objects_array = [
'total' => $total ?? count($objects),
- 'rows' => $objects,
+ 'rows' => $objects,
];
$current_page = app('api_current_page');
$limit = (int) app('api_limit_value');
@@ -39,7 +39,7 @@ class DatatablesTransformer
{
$objects_array = [
'total' => $total ?? count($objects),
- 'rows' => $objects,
+ 'rows' => $objects,
];
return $objects_array;
diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php
index 8d9a0cae2a..5cea3dff7d 100644
--- a/app/Providers/SettingsServiceProvider.php
+++ b/app/Providers/SettingsServiceProvider.php
@@ -49,6 +49,7 @@ class SettingsServiceProvider extends ServiceProvider
app()->singleton('api_offset_value', function () {
if (request()->filled('page') && ! request()->filled('offset')) {
$page = max(1, intval(request('page')));
+
return ($page - 1) * (int) app('api_limit_value');
}