From 3664e75c47edf36ce326cd0a3c406ecaa064e92e Mon Sep 17 00:00:00 2001 From: madd15 Date: Tue, 7 Jul 2015 08:51:38 +0930 Subject: [PATCH] Change validation to work correctly --- app/controllers/admin/ModelsController.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index 7e22d05b93..b2635e8d4e 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -63,8 +63,16 @@ class ModelsController extends AdminController // Create a new manufacturer $model = new Model; + $validator = Validator::make($new, $model->validationRules()); + // attempt validation - if ($model->validate($new)) { + if ($validator->fails()) + { + // The given data did not pass validation + return Redirect::back()->withInput()->withErrors($validator->messages()); + } + // attempt validation + else { if ( e(Input::get('depreciation_id')) == '') { $model->depreciation_id = 0; @@ -103,10 +111,6 @@ class ModelsController extends AdminController // Redirect to the new model page return Redirect::to("hardware/models")->with('success', Lang::get('admin/models/message.create.success')); } - } else { - // failure - $errors = $model->errors(); - return Redirect::back()->withInput()->withErrors($errors); } // Redirect to the model create page