3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-30 04:14:17 +00:00

Move sanitization of input to the model attribute setters. This cleans up a lot of checks in the various controller methods and ensures data will be set in the model accurately regardless of where it's set. Add unit tests for these methods (#3102)

This commit is contained in:
Daniel Meltzer
2016-12-26 18:17:46 -05:00
committed by snipe
parent fd450e2773
commit 06af9311fc
19 changed files with 403 additions and 417 deletions

View File

@ -75,19 +75,9 @@ class AssetModelsController extends Controller
// Create a new asset model
$model = new AssetModel;
if ($request->input('depreciation_id') == '') {
$model->depreciation_id = 0;
} else {
$model->depreciation_id = $request->input('depreciation_id');
}
if ($request->input('eol') == '') {
$model->eol = 0;
} else {
$model->eol = $request->input('eol');
}
// Save the model data
$model->eol = $request->input('eol');
$model->depreciation_id = $request->input('depreciation_id');
$model->name = $request->input('name');
$model->model_number = $request->input('model_number');
$model->manufacturer_id = $request->input('manufacturer_id');
@ -199,18 +189,8 @@ class AssetModelsController extends Controller
return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
}
if ($request->input('depreciation_id') == '') {
$model->depreciation_id = 0;
} else {
$model->depreciation_id = $request->input('depreciation_id');
}
if ($request->input('eol') == '') {
$model->eol = null;
} else {
$model->eol = $request->input('eol');
}
$model->depreciation_id = $request->input('depreciation_id');
$model->eol = $request->input('eol');
$model->name = $request->input('name');
$model->model_number = $request->input('model_number');
$model->manufacturer_id = $request->input('manufacturer_id');