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

Added category to output

Browse Source
This commit is contained in:
snipe
2015-03-13 20:32:47 -07:00
parent 9cf2798424
commit 2244c60499
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+10 -3
View File
@@ -881,7 +881,7 @@ class AssetsController extends AdminController
public function getDatatable($status = null)
{
$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog','model')->Hardware();
$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware();
switch ($status) {
@@ -958,10 +958,17 @@ class AssetsController extends AdminController
return $assets->model->name;
})
->addColumn('eol',function($assets)
->addColumn('category',function($assets)
{
return $assets->model->category->name;
})
->addColumn('eol',function($assets)
{
return $assets->eol_date();
})
->addColumn('checkout_date',function($assets)
{
@@ -972,7 +979,7 @@ class AssetsController extends AdminController
})
->addColumn($inout)
->addColumn($actions)
->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout')
->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category')
->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout')
->make();