diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index 0745ffd2a5..c02ad3042e 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -110,11 +110,12 @@ class AssetPresenter extends Presenter 'visible' => false, 'formatter' => 'employeeNumFormatter', ],[ - 'field' => 'assigned_to.jobtitle', + 'field' => 'jobtitle', 'searchable' => true, - 'sortable' => true, + 'sortable' => false, '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 + '';