From 35cf5b3d609fec2bc3613bdae42d338448413520 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 23 Feb 2015 18:46:04 -0800 Subject: [PATCH] Fixes #423 --- app/controllers/admin/AssetsController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 9e5ebfd451..675a73ded0 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -239,7 +239,10 @@ class AssetsController extends AdminController // Grab the dropdown list of models - $model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id'); + $model_list = array('' => '') + DB::table('models') + ->select(DB::raw('concat(name," / ",modelno) as name, id'))->orderBy('name', 'asc') + ->orderBy('modelno', 'asc') + ->lists('name', 'id'); $supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id'); $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id');