diff --git a/app/config/version.php b/app/config/version.php index 35dc7d0e90..572817c39e 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0.6-77', - 'hash_version' => 'v2.0.6-77-g7f46a48', + 'app_version' => 'v2.0.6-78', + 'hash_version' => 'v2.0.6-78-gf1b0085', ); \ No newline at end of file diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index e64f57a634..135d44c6b2 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -116,7 +116,7 @@ class ModelsController extends AdminController $model->manufacturer_id = e(Input::get('manufacturer_id')); $model->category_id = e(Input::get('category_id')); $model->user_id = Sentry::getId(); - $model->show_mac_address = e(Input::get('show_mac_address', '0')); + //$model->show_mac_address = e(Input::get('show_mac_address', '0')); if (Input::file('image')) { @@ -374,8 +374,8 @@ class ModelsController extends AdminController return $view; } - - + + public function getCustomFields($modelId) { $model=Model::find($modelId);