Skip to content

A free open source IT asset/license management system

Drop the limit from the next/prev links unless they were specifically sent in the URL parameters

snipe8d8a1889cddb
diff --git a/app/Http/Transformers/DatatablesTransformer.php b/app/Http/Transformers/DatatablesTransformer.php
index a5639931e2..cf29f2d821 100644
--- a/app/Http/Transformers/DatatablesTransformer.php
+++ b/app/Http/Transformers/DatatablesTransformer.php
@@ -23,10 +23,10 @@ class DatatablesTransformer
$base_query = collect(request()->query())->except(['page', 'offset'])->all();
$objects_array['prev_page_url'] = $current_page > 1
- ? request()->url().'?'.http_build_query(array_merge($base_query, ['page' => $current_page - 1, 'limit' => $limit]))
+ ? request()->url().'?'.http_build_query(array_merge($base_query, ['page' => $current_page - 1]))
: null;
$objects_array['next_page_url'] = $current_page < $total_pages
- ? request()->url().'?'.http_build_query(array_merge($base_query, ['page' => $current_page + 1, 'limit' => $limit]))
+ ? request()->url().'?'.http_build_query(array_merge($base_query, ['page' => $current_page + 1]))
: null;
return $objects_array;
diff --git a/tests/Feature/Assets/Api/AssetPaginationTest.php b/tests/Feature/Assets/Api/AssetPaginationTest.php
index a8f752f3a7..941a98d39f 100644
--- a/tests/Feature/Assets/Api/AssetPaginationTest.php
+++ b/tests/Feature/Assets/Api/AssetPaginationTest.php
@@ -219,6 +219,17 @@ class AssetPaginationTest extends TestCase
$this->assertStringContainsString('limit=5', $url);
}
+ public function test_page_urls_do_not_include_limit_when_not_in_original_request()
+ {
+ Asset::factory()->count(600)->create();
+
+ $response = $this->actingAsForApi($this->user)
+ ->getJson(route('api.assets.index', ['page' => 1]))
+ ->assertOk();
+
+ $this->assertStringNotContainsString('limit=', $response->json('next_page_url'));
+ }
+
public function test_both_page_urls_null_when_single_page()
{
Asset::factory()->count(3)->create();