A free open source IT asset/license management system
Fixed #18017 - show status on bulk audit
snipe39be0c559061
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.phpindex 7386807a2b..e7e186adb6 100644--- a/app/Http/Controllers/Api/AssetsController.php+++ b/app/Http/Controllers/Api/AssetsController.php@@ -1149,6 +1149,8 @@ class AssetsController extends Controller'id' => $asset->id,'asset_tag' => $asset->asset_tag,'note' => $request->input('note'),+ 'status_label' => $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.phpindex efad784eb8..64f5be02db 100644--- a/resources/views/hardware/quickscan.blade.php+++ b/resources/views/hardware/quickscan.blade.php@@ -107,6 +107,7 @@<tr><th>{{ trans('general.asset_tag') }}</th><th>{{ trans('general.bulkaudit_status') }}</th>+ <th>{{ trans('general.status') }}</th><th></th></tr><tr id="audit-loader" style="display: none;">@@ -154,7 +155,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><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><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');