Skip to content

A free open source IT asset/license management system

Show note

sniped837e4845b27
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index e7e186adb6..33dafaeacb 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -1148,8 +1148,8 @@ class AssetsController extends Controller
$payload = [
'id' => $asset->id,
'asset_tag' => $asset->asset_tag,
- 'note' => $request->input('note'),
- 'status_label' => $asset->assetstatus->display_name,
+ 'note' => e($request->input('note')),
+ 'status_label' => e($asset->assetstatus->display_name),
'status_type' => $asset->assetstatus->getStatuslabelType(),
'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date),
];
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index 64f5be02db..ef607209f7 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -108,6 +108,7 @@
<th>{{ trans('general.asset_tag') }}</th>
<th>{{ trans('general.bulkaudit_status') }}</th>
<th>{{ trans('general.status') }}</th>
+ <th>{{ trans('general.notes') }}</th>
<th></th>
</tr>
<tr id="audit-loader" style="display: none;">
@@ -155,7 +156,7 @@
success : function (data) {
if (data.status == 'success') {
- $('#audited tbody').prepend("<tr class='success'><td>" + data.payload.asset_tag + "</td><td>" + data.messages + "</td><td>" + data.payload.status_label + " (" + data.payload.status_type + ")</td><td><i class='fas fa-check text-success' style='font-size:18px;'></i></td></tr>");
+ $('#audited tbody').prepend("<tr class='success'><td>" + data.payload.asset_tag + "</td><td>" + data.messages + "</td><td>" + data.payload.status_label + " (" + data.payload.status_type + ")</td><td>" + data.payload.note + "</td><td><i class='fas fa-check text-success' style='font-size:18px;'></i></td></tr>");
@if ($user->enable_sounds)
var audio = new Audio('{{ config('app.url') }}/sounds/success.mp3');
@@ -202,7 +203,7 @@
}
}
- $('#audited tbody').prepend("<tr class='danger'><td>" + asset_tag + "</td><td>" + messages + "</td><td><i class='fas fa-times text-danger' style='font-size:18px;'></i></td></tr>");
+ $('#audited tbody').prepend("<tr class='danger'><td>" + asset_tag + "</td><td>" + messages + "</td><td></td><td></td><td><i class='fas fa-times text-danger' style='font-size:18px;'></i></td></tr>");
}
function incrementOnSuccess() {