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

Eager load some models

Browse Source
This commit is contained in:
snipe
2015-10-21 23:17:22 -07:00
parent 440bc1a4b4
commit bd418d1422
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/version.php
+2 -2
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v2.0-206',
'hash_version' => 'v2.0-206-g69c95f1',
'app_version' => 'v2.0-314',
'hash_version' => 'v2.0-314-gdba7983',
);
app/controllers/admin/AssetsController.php
+1 -1
View File
@@ -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) {