From c69f1c0890e673e249e38a5aebb520323c5e9b60 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Oct 2025 12:43:59 +0100 Subject: [PATCH] Smaller fix for missing audit images --- app/Http/Controllers/Controller.php | 3 +++ app/Http/Transformers/ActionlogsTransformer.php | 1 + app/Models/Actionlog.php | 4 ++++ resources/views/hardware/view.blade.php | 1 + resources/views/partials/bootstrap-table.blade.php | 6 +++--- routes/api.php | 6 +++--- routes/web.php | 4 ++-- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 266769ffb2..367ab1c10c 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -45,6 +45,7 @@ abstract class Controller extends BaseController 'accessories' => Accessory::class, 'maintenances' => Maintenance::class, 'assets' => Asset::class, + 'audits' => Asset::class, 'components' => Component::class, 'consumables' => Consumable::class, 'hardware' => Asset::class, @@ -58,6 +59,7 @@ abstract class Controller extends BaseController 'accessories' => 'private_uploads/accessories/', 'maintenances' => 'private_uploads/maintenances/', 'assets' => 'private_uploads/assets/', + 'audits' => 'private_uploads/audits/', 'components' => 'private_uploads/components/', 'consumables' => 'private_uploads/consumables/', 'hardware' => 'private_uploads/assets/', @@ -71,6 +73,7 @@ abstract class Controller extends BaseController 'accessories' => 'accessory', 'maintenances' => 'maintenance', 'assets' => 'asset', + 'audits' => 'audits', 'components' => 'component', 'consumables' => 'consumable', 'hardware' => 'asset', diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index f03f7404ba..2cf16d0640 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -149,6 +149,7 @@ class ActionlogsTransformer 'filename' => $actionlog->filename, 'inlineable' => StorageHelper::allowSafeInline($actionlog->uploads_file_path()), 'exists_on_disk' => Storage::exists($actionlog->uploads_file_path()) ? true : false, + 'mediatype' => StorageHelper::getMediaType($actionlog->uploads_file_path()), ] : null, 'item' => ($actionlog->item) ? [ diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php index 3d5820f730..772c138f25 100755 --- a/app/Models/Actionlog.php +++ b/app/Models/Actionlog.php @@ -478,6 +478,10 @@ class Actionlog extends SnipeModel $object = 'models'; } + if ($this->action_type == 'audit') { + $object = 'audits'; + } + return route('ui.files.show', [ 'object_type' => $object, 'id' => $this->item_id, diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index afb8ca24ab..0524ca3292 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1391,6 +1391,7 @@ {{ trans('admin/hardware/table.icon') }} {{ trans('general.date') }} {{ trans('general.created_by') }} + {{ trans('general.image') }} {{ trans('general.file_name') }} {{ trans('general.notes') }} {{ trans('general.download') }} diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 3584012cb4..3512438014 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -1517,9 +1517,9 @@ } } - function auditImageFormatter(value){ - if (value){ - return '' + function auditImageFormatter(value, row) { + if ((row) && (row.file) && (row.file.url)) { + return '' } } diff --git a/routes/api.php b/routes/api.php index 94c7ca3df5..b057705455 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1348,7 +1348,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'index' ] )->name('api.files.index') - ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']); + ->where(['object_type' => 'accessories|audits|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']); // Get a file Route::get('{object_type}/{id}/files/{file_id}', @@ -1357,7 +1357,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'show' ] )->name('api.files.show') - ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']); + ->where(['object_type' => 'accessories|audits|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']); // Upload files(s) Route::post('{object_type}/{id}/files', @@ -1366,7 +1366,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'store' ] )->name('api.files.store') - ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']); + ->where(['object_type' => 'accessories|audits|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']); // Delete files(s) Route::delete('{object_type}/{id}/files/{file_id}/delete', diff --git a/routes/web.php b/routes/web.php index f784b321a5..53595cb8a3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -716,7 +716,7 @@ Route::group(['middleware' => 'web'], function () { 'show' ] )->name('ui.files.show') - ->where(['object_type' => 'assets|maintenances|hardware|models|users|locations|accessories|consumables|licenses|components']); + ->where(['object_type' => 'assets|audits|maintenances|hardware|models|users|locations|accessories|consumables|licenses|components']); // Upload files(s) Route::post('{object_type}/{id}/files', @@ -725,7 +725,7 @@ Route::group(['middleware' => 'web'], function () { 'store' ] )->name('ui.files.store') - ->where(['object_type' => 'assets|maintenances|hardware|models|users|locations|accessories|consumables|licenses|components']); + ->where(['object_type' => 'assets|audits|maintenances|hardware|models|users|locations|accessories|consumables|licenses|components']); // Delete files(s) Route::delete('{object_type}/{id}/files/{file_id}/delete',