diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index fe2e40cf68..8a9ab7dc93 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -64,7 +64,7 @@ class AssetsController extends AdminController $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id'); - $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id'); + $assigned_to = array('' => Lang::get('general.select_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('' => Lang::get('general.select_location')) + Location::orderBy('name', 'asc')->lists('name', 'id'); @@ -626,7 +626,7 @@ class AssetsController extends AdminController // get depreciation list $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id'); - $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat (first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id'); + $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id'); $asset = clone $asset_to_clone; $asset->id = null; diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php index 94a6196ce5..814447fa31 100755 --- a/app/controllers/admin/LicensesController.php +++ b/app/controllers/admin/LicensesController.php @@ -405,7 +405,7 @@ class LicensesController extends AdminController ->leftJoin('users', 'users.id', '=', 'assets.assigned_to') ->leftJoin('models', 'assets.model_id', '=', 'models.id') ->select('assets.id', 'assets.name', 'first_name', 'last_name','asset_tag', - DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id, models.name as modelname')) + DB::raw('concat(first_name," ",last_name) as full_name, assets.id as id, models.name as modelname')) ->whereNull('assets.deleted_at') ->get();