Skip to content

A free open source IT asset/license management system

Same for assets

snipee76036965b34
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 3cd79485c4..74d67963ba 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -66,7 +66,8 @@ class AssetsController extends Controller
public function index(Request $request): View
{
$this->authorize('index', Asset::class);
- $company = Company::find($request->input('company_id'));
+ $companyId = $request->input('company_id');
+ $company = is_scalar($companyId) ? Company::find($companyId) : null;
return view('hardware/index')->with('company', $company);
}
diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php
index c864cf92bc..b6c5a25eac 100755
--- a/resources/views/hardware/index.blade.php
+++ b/resources/views/hardware/index.blade.php
@@ -9,7 +9,7 @@
$requestStatusTypeId = request()->input('status_id');
@endphp
- @if (($requestCompanyId) && ($company))
+ @if (is_scalar($requestCompanyId) && ($company instanceof \App\Models\Company))
{{ $company->name }}
@endif
@@ -40,7 +40,7 @@
@endif
{{ trans('general.assets') }}
- @if (Request::has('order_number'))
+ @if (Request::has('order_number') && is_scalar($requestOrderNumber))
: Order #{{ strval($requestOrderNumber) }}
@endif
@stop
@@ -56,10 +56,12 @@
<x-container>
<x-box name="assets">
<x-table.assets :route="route('api.assets.index',
- array('status_type' => e($requestStatusType),
- 'order_number'=>e(strval($requestOrderNumber)),
- 'company_id'=>e($requestCompanyId),
- 'status_id'=>e($requestStatusTypeId)))"/>
+ array(
+ 'status_type' => is_scalar($requestStatusType) ? $requestStatusType : null,
+ 'order_number' => is_scalar($requestOrderNumber) ? strval($requestOrderNumber) : null,
+ 'company_id' => is_scalar($requestCompanyId) ? $requestCompanyId : null,
+ 'status_id' => is_scalar($requestStatusTypeId) ? $requestStatusTypeId : null,
+ ))"/>
</x-box>
</x-container>
@stop
diff --git a/tests/Feature/Assets/Ui/AssetIndexTest.php b/tests/Feature/Assets/Ui/AssetIndexTest.php
index c3ed0fbad3..3fcaa5990f 100644
--- a/tests/Feature/Assets/Ui/AssetIndexTest.php
+++ b/tests/Feature/Assets/Ui/AssetIndexTest.php
@@ -13,4 +13,16 @@ class AssetIndexTest extends TestCase
->get(route('hardware.index'))
->assertOk();
}
+
+ public function test_page_renders_with_array_query_inputs()
+ {
+ $this->actingAs(User::factory()->superuser()->create())
+ ->get(route('hardware.index', [
+ 'status_type' => ['Deleted'],
+ 'order_number' => [123],
+ 'company_id' => [1],
+ 'status_id' => [1],
+ ]))
+ ->assertOk();
+ }
}