From 5c28089f2bba4cfde03563b128d60147514c7ece Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 28 Nov 2013 16:37:05 -0500 Subject: [PATCH] RTD has to be 0, or it will conflict with the custom status labels --- app/controllers/admin/AssetsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 2d25883e33..dec8e27af4 100644 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -185,7 +185,7 @@ class AssetsController extends AdminController { $model_list = array('' => '') + Model::lists('name', 'id'); // Grab the dropdown list of status - $statuslabel_list = array('' => 'Pending') + array('1' => 'Ready to Deploy') + Statuslabel::lists('name', 'id'); + $statuslabel_list = array('' => 'Pending') + array('0' => 'Ready to Deploy') + Statuslabel::lists('name', 'id'); // get depreciation list $depreciation_list = array('' => '') + Depreciation::lists('name', 'id'); @@ -495,7 +495,7 @@ class AssetsController extends AdminController { $model_list = array('' => '') + Model::lists('name', 'id'); // Grab the dropdown list of status - $statuslabel_list = array('' => 'Pending') + array('1' => 'Ready to Deploy') + Statuslabel::lists('name', 'id'); + $statuslabel_list = array('' => 'Pending') + array('0' => 'Ready to Deploy') + Statuslabel::lists('name', 'id'); // get depreciation list $depreciation_list = array('' => '') + Depreciation::lists('name', 'id');