From 06c5bce3c7dfa54e0e843a1d466a8902aab118e7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 22 Aug 2017 21:40:35 -0700
Subject: [PATCH] Fixes #3865 - employee number mislabeled in list output

---
 app/Presenters/AssetPresenter.php                  | 3 +--
 resources/views/partials/bootstrap-table.blade.php | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index 3f60a613e..40cbe5675 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -100,13 +100,12 @@ class AssetPresenter extends Presenter
                 "visible" => true,
                 "formatter" => "usersLinkObjFormatter"
             ], [
-                "field" => "assigned_to",
+                "field" => "employee_number",
                 "searchable" => false,
                 "sortable" => false,
                 "title" => trans('admin/users/table.employee_num'),
                 "visible" => false,
                 "formatter" => "employeeNumFormatter"
-
             ],[
                 "field" => "location",
                 "searchable" => true,
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index a45a27de7..7e12ed4a4 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -322,10 +322,9 @@ $('.snipe-table').bootstrapTable({
     }
 
     function employeeNumFormatter(value, row) {
-        if ((value) && (value.employee_number)) {
-            return '<a href="{{ url('/') }}/users/' + row.id + '"> ' + value.employee_number + '</a>';
-        } else {
-            return value;
+
+        if ((row.assigned_to) && ((row.assigned_to.employee_number))) {
+            return '<a href="{{ url('/') }}/users/' + row.assigned_to.id + '"> ' + row.assigned_to.employee_number + '</a>';
         }
     }