Skip to content

A free open source IT asset/license management system

Fixed #18574 - adds checked out field to maintenances

snipeed201b24d65f
diff --git a/app/Http/Controllers/Api/MaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.php
index ff8b85a0e7..6c4293dc3b 100644
--- a/app/Http/Controllers/Api/MaintenancesController.php
+++ b/app/Http/Controllers/Api/MaintenancesController.php
@@ -36,7 +36,7 @@ class MaintenancesController extends Controller
$this->authorize('view', Asset::class);
$maintenances = Maintenance::select('maintenances.*')
- ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'asset.assetstatus', 'adminuser');
+ ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company', 'asset.assetstatus', 'adminuser', 'asset.assignedTo',);
if ($request->filled('search')) {
$maintenances = $maintenances->TextSearch($request->input('search'));
diff --git a/app/Http/Transformers/MaintenancesTransformer.php b/app/Http/Transformers/MaintenancesTransformer.php
index dfadcd968e..6cca80d514 100644
--- a/app/Http/Transformers/MaintenancesTransformer.php
+++ b/app/Http/Transformers/MaintenancesTransformer.php
@@ -46,6 +46,7 @@ class MaintenancesTransformer
'status_type' => e($assetmaintenance->asset->assetstatus->getStatuslabelType()),
'status_meta' => e($assetmaintenance->asset->present()->statusMeta),
] : null,
+ 'assigned_to' => (new AssetsTransformer)->transformAssignedTo($assetmaintenance->asset),
'company' => (($assetmaintenance->asset) && ($assetmaintenance->asset->company)) ? [
'id' => (int) $assetmaintenance->asset->company->id,
'name' => ($assetmaintenance->asset->company->name) ? e($assetmaintenance->asset->company->name) : null,
diff --git a/app/Presenters/MaintenancesPresenter.php b/app/Presenters/MaintenancesPresenter.php
index ce98f5b1fe..2aa57461b1 100644
--- a/app/Presenters/MaintenancesPresenter.php
+++ b/app/Presenters/MaintenancesPresenter.php
@@ -88,6 +88,13 @@ class MaintenancesPresenter extends Presenter
'switchable' => true,
'title' => trans('general.model_no'),
'visible' => true,
+ ],[
+ 'field' => 'assigned_to',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('admin/hardware/form.checkedout_to'),
+ 'visible' => true,
+ 'formatter' => 'polymorphicItemFormatter',
],
[
'field' => 'supplier',