ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change to use eager loaded userloc not assetloc

Browse Source
This commit is contained in:
madd15
2015-03-18 10:50:52 +10:30
parent b3a75690f1
commit fdb92a2012
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+2 -2
View File
@@ -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);
}