diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index ae4cc5b8f1..484da8f29f 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -155,7 +155,7 @@ class AssetsController extends AdminController } else { $asset->rtd_location_id = e(Input::get('rtd_location_id')); } - $checkModel = $this->checkModel(e(Input::get('model_id'))); + $checkModel = $asset->checkModel(e(Input::get('model_id'))); $asset->mac_address = ($checkModel == true) ? e(Input::get('mac_address')) : NULL; // Save the asset data diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index 29ef9e400d..8a8fcb7d4a 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -346,10 +346,6 @@ class ModelsController extends AdminController ->make(); } - public function checkModel($modelId) { - $model = Model::find($modelId); - return $model->show_mac_address; - } public function getDataView($modelID) { diff --git a/app/models/Asset.php b/app/models/Asset.php index 2a49932bbb..a62f58a603 100755 --- a/app/models/Asset.php +++ b/app/models/Asset.php @@ -131,6 +131,12 @@ class Asset extends Depreciable return $this->name; } } + + + public function checkModel($modelId) { + $model = Model::find($modelId); + return $model->show_mac_address; + } public function warrantee_expires()