diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 61af6ce424..53871a5206 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -94,7 +94,14 @@ class AssetsController extends AdminController { // Grab the dropdown list of models - $model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id'); + //$model_list = array('' => 'Select a Model') + Model::orderBy('name', 'asc')->lists('name'.' '. 'modelno', 'id'); + + $model_list = array('' => 'Select a Model') + 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'); $assigned_to = array('' => 'Select a User') + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id'); $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id'); diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index 0cd28ca5f5..844287511e 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -80,7 +80,7 @@
- {{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:350px')) }} + {{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:400px')) }} {{ $errors->first('model_id', ' :message') }}