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

Added location to new assets view

Browse Source
This commit is contained in:
snipe
2015-03-14 01:30:12 -07:00
parent 2a0350b9d1
commit 4243710378
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+3 -3
View File
@@ -947,7 +947,7 @@ class AssetsController extends AdminController
->addColumn('status',function($assets)
{
if ($assets->assigned_to!='') {
return link_to('../users/'.$assets->assigned_to.'/view', $assets->assigneduser->fullName());
return link_to('../admin/users/'.$assets->assigned_to.'/view', $assets->assigneduser->fullName());
} else {
return $assets->assetstatus->name;
}
@@ -955,9 +955,9 @@ class AssetsController extends AdminController
})
->addColumn('location',function($assets)
{
if ($assets->assigned_to && $assets->assetloc) {
if ($assets->assigned_to && $assets->assetloc) {
return link_to('admin/location/'.$assets->assetloc->id.'/edit', $assets->assetloc->name);
} elseif ($assets->defaultLoc!=''){
} elseif ($assets->defaultLoc){
return link_to('admin/location/'.$assets->defaultLoc->id.'/edit', $assets->defaultLoc->name);
}
})