Merge remote-tracking branch 'origin/master' into 1.3.0

# Conflicts: # app/controllers/admin/AssetsController.php
snipe · Jun 9, 2015 · af2dece · af2dece
2 parents 9ea8316 + c69038d
commit af2dece
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
@@ -1006,8 +1006,8 @@ public function postBulkSave($assets = null)
     public function getDatatable($status = null)
     {
 
-      $assets = Asset::with('model','assigneduser','defaultloc','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'));
-
+       $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'));
+       
 
       switch ($status) {
       case 'Pending':