Fixed checkmodel at route level

snipe · Mar 28, 2015 · 5d946b1 · 5d946b1
1 parent d2e23ad
commit 5d946b1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
@@ -155,7 +155,7 @@ public function postCreate()
             } else {
                 $asset->rtd_location_id     = e(Input::get('rtd_location_id'));
             }
-            $checkModel = $asset->checkModel(e(Input::get('model_id')));
+
             $asset->mac_address = ($checkModel == true) ? e(Input::get('mac_address')) : NULL;
 
             // Save the asset data
@@ -292,7 +292,7 @@ public function postEdit($assetId = null)
                 $asset->rtd_location_id     = e(Input::get('rtd_location_id'));
             }
 
-            $checkModel = $this->checkModel(e(Input::get('model_id')));
+
             $asset->mac_address = ($checkModel == true) ? e(Input::get('mac_address')) : NULL;
 
             // Update the asset data

diff --git a/app/models/Asset.php b/app/models/Asset.php
@@ -132,13 +132,6 @@ public function assetNameForEula()
 	    }
     }
 
-
-    public function checkModel($modelId) {
-        $model = Model::find($modelId);
-        return $model->show_mac_address;
-    }
-
-
      public function warrantee_expires()
     {
             $date = date_create($this->purchase_date);

diff --git a/app/routes.php b/app/routes.php
@@ -29,8 +29,12 @@
     /*---Models API---*/
     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'));
+        Route::get('list/{status?}', array('as'=>'api.models.list', 'uses'=>'ModelsController@getDatatable'));        
+        Route::get('{modelId}/check', function ($modelId) {
+			 $model = Model::find($modelId);
+			 return $model->show_mac_address;
+		});
+
         Route::get('{modelID}/view', array('as'=>'api.models.view', 'uses'=>'ModelsController@getDataView'));
     });
     /*--- Categories API---*/