diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index af67dee75a..37decf48ee 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -152,7 +152,7 @@ class AssetsController extends AdminController $model_list = array('' => '') + Model::orderBy('name', '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::lists('name', 'id'); + $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id'); // Grab the dropdown list of status $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id'); @@ -275,7 +275,7 @@ class AssetsController extends AdminController // Grab the dropdown list of models $model_list = array('' => '') + Model::orderBy('name', 'asc')->lists('name', 'id'); $supplier_list = array('' => '') + Supplier::orderBy('name', 'asc')->lists('name', 'id'); - $location_list = array('' => '') + Location::lists('name', 'id'); + $location_list = array('' => '') + Location::orderBy('name', 'asc')->lists('name', 'id'); // Grab the dropdown list of status $statuslabel_list = array('' => Lang::get('general.pending')) + array('0' => Lang::get('general.ready_to_deploy')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id');