Fixes #423

2015-02-23 18:46:04 -08:00
parent 7f1489a701
commit 35cf5b3d60
1 changed files with 4 additions and 1 deletions
@@ -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');