From ee7348d0d5694e9a93fbf69cfabbb593be14764f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 26 Jul 2017 16:47:47 -0700 Subject: [PATCH] Better fix for javascript formatter for employee number --- app/Presenters/AssetPresenter.php | 3 ++- resources/views/partials/bootstrap-table.blade.php | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index aa7d9af5e..ff47daa28 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -100,11 +100,12 @@ class AssetPresenter extends Presenter "visible" => true, "formatter" => "usersLinkObjFormatter" ], [ - "field" => "employee_number", + "field" => "assigned_to", "searchable" => false, "sortable" => false, "title" => trans('admin/users/table.employee_num'), "visible" => false, + "formatter" => "employeeNumFormatter" ],[ "field" => "location", diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 375dae244..2c55d61b8 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -321,6 +321,14 @@ $('.snipe-table').bootstrapTable({ } } + function employeeNumFormatter(value, row) { + if ((value) && (value.employee_number)) { + return ' ' + value.employee_number + ''; + } else { + return value; + } + } + function orderNumberObjFilterFormatter(value, row) { if (value) { return ' ' + row.order_number + '';