From bd418d142261c2bea551966e7da04ba179cf5b7e Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 21 Oct 2015 23:17:22 -0700 Subject: [PATCH] Eager load some models --- app/config/version.php | 4 ++-- app/controllers/admin/AssetsController.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/version.php b/app/config/version.php index 76fb97a8a4..c0fcad7579 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0-206', - 'hash_version' => 'v2.0-206-g69c95f1', + 'app_version' => 'v2.0-314', + 'hash_version' => 'v2.0-314-gdba7983', ); \ No newline at end of file diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index bf4a76160b..dfab338750 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -1095,7 +1095,7 @@ class AssetsController extends AdminController $limit = 50; } - $assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware()->select(array('assets.id', 'assets.name','assets.model_id','assets.assigned_to','assets.asset_tag','assets.serial','assets.status_id','assets.purchase_date','assets.deleted_at','assets.rtd_location_id','assets.notes','assets.order_number')); + $assets = Asset::with('model','assigneduser','assigneduser.userloc','assetstatus','defaultLoc','assetlog','model','model.category','assetstatus')->Hardware()->select(array('assets.id', 'assets.name','assets.model_id','assets.assigned_to','assets.asset_tag','assets.serial','assets.status_id','assets.purchase_date','assets.deleted_at','assets.rtd_location_id','assets.notes','assets.order_number')); switch ($status) {