diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index dc48effedd..79a8671543 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -1029,13 +1029,4 @@ class AssetsController extends AdminController ->make(); } - - public function checkModel($id = null) { - if(Input::get('id')) { - $id = e(Input::get('id')); - } - $model = DB::table('models')->select('id','show_mac_address')->where('id','=',$id)->whereNull('deleted_at')->first(); - return $model->show_mac_address; - } - } diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index faf3f29b8f..1bdcd7492b 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -345,5 +345,10 @@ class ModelsController extends AdminController ->orderColumns('name','modelno','asset_count','depreciation','category','eol','actions') ->make(); } + + public function checkModel($modelId) { + $model = Model::find($modelId); + return $model->show_mac_address; + } } diff --git a/app/routes.php b/app/routes.php index 613c2ea507..157028a0b7 100755 --- a/app/routes.php +++ b/app/routes.php @@ -29,6 +29,7 @@ Route::group(array('prefix' => 'api', 'namespace' => 'Controllers\Admin', 'befor Route::group(array('prefix'=>'models'), function() { Route::resource('/', 'ModelsController'); Route::get('list/{status?}', array('as'=>'api.models.list', 'uses'=>'ModelsController@getDatatable')); + Route::get('{modelId}/check', array('as' => 'api.models.check', 'uses' => 'ModelsController@checkModel')); }); /*--- Categories API---*/ Route::group(array('prefix'=>'categories'), function() { @@ -84,7 +85,6 @@ Route::group(array('prefix' => 'hardware', 'namespace' => 'Controllers\Admin', ' Route::get('{assetId}/deletefile/{fileId}', array('as' => 'delete/assetfile', 'uses' => 'AssetsController@getDeleteFile')); Route::get('{assetId}/showfile/{fileId}', array('as' => 'show/assetfile', 'uses' => 'AssetsController@displayFile')); Route::post('{assetId}/edit', 'AssetsController@postEdit'); - Route::get('check/model', array('as' => 'check.model', 'uses' => 'AssetsController@checkModel')); Route::post('bulkedit', array('as' => 'hardware/bulkedit', diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index 7bf6a804c1..dee143bb86 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -220,12 +220,14 @@ var $eventSelect = $(".model"); $eventSelect.on("change", function () { mac_add($eventSelect.val()); }); $(function() { - mac_add($(".model option:selected").val()); + var mac = $(".model option:selected").val(); + if(mac!=''){ + mac_add(mac); + } }); function mac_add(id) { $.ajax({ - url: '{{ route('check.model') }}', - data: 'id=' + id, + url: "{{Config::get('app.url')}}/api/models/"+id+"/check", success: function(data) { if(data == true){ $("#mac_address").css("display", "block");