Skip to content

A free open source IT asset/license management system

Fixed weird component linking

snipe7aef0f78b08f
diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php
index cc3b9740c7..6fab2077b4 100644
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -88,12 +88,10 @@ class ComponentsTransformer
$array = [];
foreach ($components_assets as $asset) {
$array[] = [
- 'assigned_pivot_id' => $asset->pivot->id,
- 'id' => (int) $asset->id,
- 'name' => e($asset->display_name),
+ 'id' => (int) $asset->pivot->id,
+ 'assigned_to' => $this->transformAssignedTo($asset),
'qty' => $asset->pivot->assigned_qty,
'note' => ($asset->pivot->note) ? e($asset->pivot->note) : null,
- 'type' => 'asset',
'created_at' => Helper::getFormattedDateObject($asset->pivot->created_at, 'datetime'),
'available_actions' => ['checkin' => true],
];
@@ -101,4 +99,10 @@ class ComponentsTransformer
return (new DatatablesTransformer)->transformDatatables($array, $total);
}
+
+ public function transformAssignedTo($componentCheckout)
+ {
+ return (new AssetsTransformer)->transformAssetCompact($componentCheckout);
+ }
+
}
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index b54f76360a..fca5ec47e9 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -214,12 +214,12 @@ class ComponentPresenter extends Presenter
'visible' => false,
],
[
- 'field' => 'name',
+ 'field' => 'assigned_to',
'searchable' => true,
'sortable' => true,
'title' => trans('general.name'),
'visible' => true,
- 'formatter' => 'componentsLinkFormatter',
+ 'formatter' => 'polymorphicItemFormatter',
],
[
'field' => 'qty',