Skip to content

A free open source IT asset/license management system

Fixed #18821 - pagination on history

snipe4c4ec3eacc58
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index 5a3b63bf8f..a4cb7a8d56 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -406,7 +406,11 @@ class AccessoriesController extends Controller
{
$this->authorize('history', $accessory);
$history = $accessory->getHistory($request);
+ $total = $accessory->getHistory($request)->count();
+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $limit = app('api_limit_value');
+ $history = $history->skip($offset)->take($limit)->get();
- return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
}
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index 71bad53097..bf7d674b10 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -344,7 +344,11 @@ class AssetModelsController extends Controller
{
$this->authorize('history', $model);
$history = $model->getHistory($request);
+ $total = $model->getHistory($request)->count();
+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $limit = app('api_limit_value');
+ $history = $history->skip($offset)->take($limit)->get();
- return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
}
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 9e70459e64..c8dcc03d68 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -1445,7 +1445,11 @@ class AssetsController extends Controller
{
$this->authorize('history', $asset);
$history = $asset->getHistory($request);
+ $total = $asset->getHistory($request)->count();
+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $limit = app('api_limit_value');
+ $history = $history->skip($offset)->take($limit)->get();
- return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
}
diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
index a9ee4777d5..4ddf21b59c 100644
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -392,7 +392,11 @@ class ComponentsController extends Controller
{
$this->authorize('history', $component);
$history = $component->getHistory($request);
+ $total = $component->getHistory($request)->count();
+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $limit = app('api_limit_value');
+ $history = $history->skip($offset)->take($limit)->get();
- return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
}
diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
index 0d56be9fb4..325b0cc134 100644
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -362,7 +362,11 @@ class ConsumablesController extends Controller
{
$this->authorize('history', $consumable);
$history = $consumable->getHistory($request);
+ $total = $consumable->getHistory($request)->count();
+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $limit = app('api_limit_value');
+ $history = $history->skip($offset)->take($limit)->get();
- return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
}
diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php
index 317c8fb2ec..5eece6fd6e 100644
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -283,7 +283,11 @@ class LicensesController extends Controller
{
$this->authorize('history', $license);
$history = $license->getHistory($request);
+ $total = $license->getHistory($request)->count();
+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $limit = app('api_limit_value');
+ $history = $history->skip($offset)->take($limit)->get();
- return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
}
diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php
index 17c2f14cb5..2bf9d3f5f1 100644
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -463,7 +463,11 @@ class LocationsController extends Controller
{
$this->authorize('history', $location);
$history = $location->getHistory($request);
+ $total = $location->getHistory($request)->count();
+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $limit = app('api_limit_value');
+ $history = $history->skip($offset)->take($limit)->get();
- return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
}
diff --git a/app/Http/Controllers/Api/MaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.php
index 40b2ba72b4..1c95e88fc2 100644
--- a/app/Http/Controllers/Api/MaintenancesController.php
+++ b/app/Http/Controllers/Api/MaintenancesController.php
@@ -261,7 +261,11 @@ class MaintenancesController extends Controller
$asset = $maintenance->asset;
$this->authorize('history', $asset);
$history = $maintenance->getHistory($request);
+ $total = $maintenance->getHistory($request)->count();
+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $limit = app('api_limit_value');
+ $history = $history->skip($offset)->take($limit)->get();
- return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
}
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 903ccdb39a..f855cc2004 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -971,7 +971,11 @@ class UsersController extends Controller
{
$this->authorize('history', $user);
$history = $user->getHistory($request);
+ $total = $user->getHistory($request)->count();
+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $limit = app('api_limit_value');
+ $history = $history->skip($offset)->take($limit)->get();
- return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
}
diff --git a/app/Models/Traits/Loggable.php b/app/Models/Traits/Loggable.php
index b506d308d1..a5cf9d9049 100644
--- a/app/Models/Traits/Loggable.php
+++ b/app/Models/Traits/Loggable.php
@@ -67,8 +67,8 @@ trait Loggable
'action_date',
];
- // Start with the polymorphic history relation so all subsequent filters,
- // search terms, and sorting are applied to the same query instance.
+ // Start with the polymorphic history relation so all filters and
+ // ordering are applied to the same query instance.
$history = $this->history();
if ($request->filled('search')) {
@@ -95,11 +95,6 @@ trait Loggable
$history = $history->whereNotNull('filename');
}
- $total = $history->count();
- // Make sure the offset and limit are actually integers and do not exceed system limits
- $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
- $limit = app('api_limit_value');
-
$order = ($request->input('order') == 'asc') ? 'asc' : 'desc';
switch ($request->input('sort')) {
@@ -112,7 +107,7 @@ trait Loggable
break;
}
- return $history->skip($offset)->take($limit)->get();
+ return $history;
}
diff --git a/tests/Feature/History/Api/HistoryTest.php b/tests/Feature/History/Api/HistoryTest.php
index 10089b0a69..3c63982f58 100644
--- a/tests/Feature/History/Api/HistoryTest.php
+++ b/tests/Feature/History/Api/HistoryTest.php
@@ -338,4 +338,107 @@ class IndexHistoryTest extends TestCase
->assertJsonPath('rows.0.created_by.id', $alphaCreator->id)
->assertJsonPath('rows.1.created_by.id', $omegaCreator->id);
}
+
+ public function test_viewing_user_history_respects_limit_and_keeps_full_total()
+ {
+ $subject = User::factory()->create();
+ $actor = User::factory()->viewUserHistory()->create();
+ $uniqueNote = 'history-pagination-limit-' . uniqid();
+
+ $first = Actionlog::factory()->create([
+ 'item_id' => $subject->id,
+ 'item_type' => User::class,
+ 'created_by' => $actor->id,
+ 'action_type' => 'update',
+ 'note' => $uniqueNote,
+ 'created_at' => '2026-01-01 00:00:00',
+ 'action_date' => '2026-01-01 00:00:00',
+ ]);
+
+ Actionlog::factory()->create([
+ 'item_id' => $subject->id,
+ 'item_type' => User::class,
+ 'created_by' => $actor->id,
+ 'action_type' => 'update',
+ 'note' => $uniqueNote,
+ 'created_at' => '2026-01-02 00:00:00',
+ 'action_date' => '2026-01-02 00:00:00',
+ ]);
+
+ Actionlog::factory()->create([
+ 'item_id' => $subject->id,
+ 'item_type' => User::class,
+ 'created_by' => $actor->id,
+ 'action_type' => 'update',
+ 'note' => $uniqueNote,
+ 'created_at' => '2026-01-03 00:00:00',
+ 'action_date' => '2026-01-03 00:00:00',
+ ]);
+
+ $this->actingAsForApi($actor)
+ ->getJson(route('api.users.history', [
+ 'user' => $subject,
+ 'search' => $uniqueNote,
+ 'sort' => 'created_at',
+ 'order' => 'asc',
+ 'offset' => 0,
+ 'limit' => 1,
+ ]))
+ ->assertOk()
+ ->assertJsonPath('total', 3)
+ ->assertJsonCount(1, 'rows')
+ ->assertJsonPath('rows.0.id', $first->id);
+ }
+
+ public function test_viewing_user_history_respects_offset_and_limit_and_keeps_full_total()
+ {
+ $subject = User::factory()->create();
+ $actor = User::factory()->viewUserHistory()->create();
+ $uniqueNote = 'history-pagination-offset-' . uniqid();
+
+ Actionlog::factory()->create([
+ 'item_id' => $subject->id,
+ 'item_type' => User::class,
+ 'created_by' => $actor->id,
+ 'action_type' => 'update',
+ 'note' => $uniqueNote,
+ 'created_at' => '2026-02-01 00:00:00',
+ 'action_date' => '2026-02-01 00:00:00',
+ ]);
+
+ $second = Actionlog::factory()->create([
+ 'item_id' => $subject->id,
+ 'item_type' => User::class,
+ 'created_by' => $actor->id,
+ 'action_type' => 'update',
+ 'note' => $uniqueNote,
+ 'created_at' => '2026-02-02 00:00:00',
+ 'action_date' => '2026-02-02 00:00:00',
+ ]);
+
+ Actionlog::factory()->create([
+ 'item_id' => $subject->id,
+ 'item_type' => User::class,
+ 'created_by' => $actor->id,
+ 'action_type' => 'update',
+ 'note' => $uniqueNote,
+ 'created_at' => '2026-02-03 00:00:00',
+ 'action_date' => '2026-02-03 00:00:00',
+ ]);
+
+ $this->actingAsForApi($actor)
+ ->getJson(route('api.users.history', [
+ 'user' => $subject,
+ 'search' => $uniqueNote,
+ 'sort' => 'created_at',
+ 'order' => 'asc',
+ 'offset' => 1,
+ 'limit' => 1,
+ ]))
+ ->assertOk()
+ ->assertJsonPath('total', 3)
+ ->assertJsonCount(1, 'rows')
+ ->assertJsonPath('rows.0.id', $second->id);
+ }
+
}