From 122b3d89d9b4bb8f741ce97bf32385a53cd60fba Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 5 Nov 2014 16:11:07 -0500 Subject: [PATCH] Added assetlog to other status types --- app/controllers/admin/AssetsController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 8a9c72e2f3..583298a0d8 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -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')