diff --git a/src/User/Controller/RecoveryController.php b/src/User/Controller/RecoveryController.php index f836e35..ebc7c38 100644 --- a/src/User/Controller/RecoveryController.php +++ b/src/User/Controller/RecoveryController.php @@ -88,7 +88,7 @@ class RecoveryController extends Controller $event = $this->make(FormEvent::class, [$form]); - $this->make(AjaxRequestModelValidator::class, $form)->validate(); + $this->make(AjaxRequestModelValidator::class, [$form])->validate(); if ($form->load(Yii::$app->request->post())) { $this->trigger(FormEvent::EVENT_BEFORE_REQUEST, $event); @@ -165,7 +165,7 @@ class RecoveryController extends Controller 'module' => $this->module, ] ); - } + } else {var_dump('SHIT!');} } return $this->render('reset', ['model' => $form]); diff --git a/src/User/Validator/AjaxRequestModelValidator.php b/src/User/Validator/AjaxRequestModelValidator.php index f2f1224..6f3775e 100644 --- a/src/User/Validator/AjaxRequestModelValidator.php +++ b/src/User/Validator/AjaxRequestModelValidator.php @@ -30,12 +30,11 @@ class AjaxRequestModelValidator implements ValidatorInterface { $request = Yii::$app->request; - if ($request->getIsAjax() && !$request->getIsPjax()) { - if ($this->model->load($request->post())) { - Yii::$app->response->format = Response::FORMAT_JSON; - echo json_encode(ActiveForm::validate($this->model)); - Yii::$app->end(); - } + if ($request->getIsAjax() && $this->model->load($request->post())) { + Yii::$app->response->format = Response::FORMAT_JSON; + Yii::$app->response->data = ActiveForm::validate($this->model); + Yii::$app->response->send(); + Yii::$app->end(); } } }