From fdb92a201255cd2b2e119d84bf4b4e0c13508674 Mon Sep 17 00:00:00 2001
From: madd15 <joshdeakin@adam.com.au>
Date: Wed, 18 Mar 2015 10:50:52 +1030
Subject: [PATCH] Change to use eager loaded userloc not assetloc

---
 app/controllers/admin/AssetsController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index c08d1d7058..c8d0fc786d 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -961,8 +961,8 @@ class AssetsController extends AdminController
 	        })
 		->addColumn('location',function($assets)
             {
-                if ($assets->assigned_to && $assets->assetloc) {	                
-                    return link_to('admin/location/'.$assets->assetloc->id.'/edit', $assets->assetloc->name);
+                if ($assets->assigned_to && $assets->assigneduser->userloc) {	                
+                    return link_to('admin/location/'.$assets->assigneduser->userloc->id.'/edit', $assets->assigneduser->userloc->name);
                 } elseif ($assets->defaultLoc){
                     return link_to('admin/location/'.$assets->defaultLoc->id.'/edit', $assets->defaultLoc->name);
                 }