From ce1565a54504652e2da13408d4b594d25cc4519e Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 18 Dec 2015 12:08:08 -0500 Subject: [PATCH] Re-commented mac address - bad merge :-/ --- 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 a39adb6e07..ff7e750b63 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -178,7 +178,7 @@ class AssetsController extends AdminController } $checkModel = Config::get('app.url').'/api/models/'.e(Input::get('model_id')).'/check'; - $asset->mac_address = ($checkModel == true) ? e(Input::get('mac_address')) : NULL; + //$asset->mac_address = ($checkModel == true) ? e(Input::get('mac_address')) : NULL; // Save the asset data $asset->name = e(Input::get('name')); @@ -359,7 +359,7 @@ class AssetsController extends AdminController } $checkModel = Config::get('app.url').'/api/models/'.e(Input::get('model_id')).'/check'; - $asset->mac_address = ($checkModel == true) ? e(Input::get('mac_address')) : NULL; + //$asset->mac_address = ($checkModel == true) ? e(Input::get('mac_address')) : NULL; // Update the asset data $asset->name = e(Input::get('name'));