DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-29 07:29:44 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-10-18 14:37:37 +01:00
parent 997664f489 bc6f014fff
commit 41e96ad0ab
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/AssetsController.php
View file

@ -295,7 +295,7 @@ class AssetsController extends Controller
}
if ($request->filled('order_number')) {
$assets->where('assets.order_number', '=', $request->get('order_number'));
$assets->where('assets.order_number', '=', strval($request->get('order_number')));
}
// This is kinda gross, but we need to do this because the Bootstrap Tables

4
resources/views/hardware/index.blade.php
View file

@ -34,7 +34,7 @@
{{ trans('general.assets') }}
@if (Request::has('order_number'))
: Order #{{ Request::get('order_number') }}
: Order #{{ strval(Request::get('order_number')) }}
@endif
@stop
@ -88,7 +88,7 @@
class="table table-striped snipe-table"
data-url="{{ route('api.assets.index',
array('status' => e(Request::get('status')),
'order_number'=>e(Request::get('order_number')),
'order_number'=>e(strval(Request::get('order_number'))),
'company_id'=>e(Request::get('company_id')),
'status_id'=>e(Request::get('status_id')))) }}"
data-export-options='{