diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 91830263d6..976aff94f1 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -80,7 +80,6 @@ class AssetsTransformer 'qr' => ($setting->qr_code=='1') ? config('app.url').'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png' : null, 'alt_barcode' => ($setting->alt_barcode_enabled=='1') ? config('app.url').'/uploads/barcodes/'.str_slug($setting->alt_barcode).'-'.str_slug($asset->asset_tag).'.png' : null, 'assigned_to' => $this->transformAssignedTo($asset), - 'jobtitle' => $asset->assigned ? e($asset->assigned->jobtitle) : null, 'warranty_months' => ($asset->warranty_months > 0) ? e($asset->warranty_months.' '.trans('admin/hardware/form.months')) : null, 'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null, 'created_by' => ($asset->adminuser) ? [ @@ -204,6 +203,7 @@ class AssetsTransformer 'last_name'=> ($asset->assigned->last_name) ? e($asset->assigned->last_name) : null, 'email'=> ($asset->assigned->email) ? e($asset->assigned->email) : null, 'employee_number' => ($asset->assigned->employee_num) ? e($asset->assigned->employee_num) : null, + 'jobtitle' => $asset->assigned->jobtitle ? e($asset->assigned->jobtitle) : null, 'type' => 'user', ] : null; } diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index f9d2eea663..220ea67834 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -115,6 +115,7 @@ class AssetPresenter extends Presenter 'sortable' => true, 'title' => trans('admin/users/table.title'), 'visible' => false, + 'formatter' => 'jobtitleFormatter', ], [ 'field' => 'location', 'searchable' => true, diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 1435fea97c..b78079577a 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -869,6 +869,12 @@ } } + function jobtitleFormatter(value, row) { + if ((row) && (row.assigned_to) && ((row.assigned_to.jobtitle))) { + return '' + row.assigned_to.jobtitle + ''; + } + } + function orderNumberObjFilterFormatter(value, row) { if (value) { return '' + row.order_number + '';