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

Added assetlog to other status types

Browse Source
This commit is contained in:
snipe
2014-11-05 16:11:07 -05:00
parent 14801eca79
commit 122b3d89d9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+3 -3
View File
@@ -40,19 +40,19 @@ class AssetsController extends AdminController
// Filter results
if (Input::get('Pending')) {
$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc')
$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
->whereNull('status_id','and')
->where('assigned_to','=','0')
->where('physical', '=', 1)
->get();
} elseif (Input::get('RTD')) {
$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc')
$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
->where('status_id', '=', 0)
->where('physical', '=', 1)
->orderBy('asset_tag', 'ASC')
->get();
} elseif (Input::get('Undeployable')) {
$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc')
$assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog')
->where('physical', '=', 1)
->where('assigned_to','>','1')
->orderBy('asset_tag', 'ASC')