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

Fixes #1009 - Add MAC address to search

Browse Source
This commit is contained in:
snipe
2015-08-06 05:13:27 -07:00
parent 3c0cc94652
commit 84d81184fa
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+7 -3
View File
@@ -1078,7 +1078,7 @@ class AssetsController extends AdminController
public function getDatatable($status = null)
{
$assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('id', 'name','model_id','assigned_to','asset_tag','serial','status_id','purchase_date','deleted_at','rtd_location_id','notes','order_number'));
$assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('id', 'name','model_id','assigned_to','asset_tag','serial','status_id','purchase_date','deleted_at','rtd_location_id','notes','order_number','mac_address'));
switch ($status) {
@@ -1204,6 +1204,10 @@ class AssetsController extends AdminController
{
return $assets->notes;
})
->addColumn('mac_address',function($assets)
{
return $assets->mac_address;
})
->addColumn('order_number',function($assets)
{
@@ -1220,8 +1224,8 @@ class AssetsController extends AdminController
})
->addColumn($inout)
->addColumn($actions)
->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category','notes','order_number')
->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','notes','order_number','checkout_date', 'inout')
->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category','notes','order_number','mac_address')
->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','notes','order_number','checkout_date', 'inout','mac_address')
->make();
}