leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix validator bug on recovery controller

Browse Source
This commit is contained in:
Antonio Ramirez
2017-06-15 01:44:58 +02:00
parent 53a3a72cc5
commit 50681953c2
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/User/Controller/RecoveryController.php
View File

@ -88,7 +88,7 @@ class RecoveryController extends Controller
$event = $this->make(FormEvent::class, [$form]); $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())) { if ($form->load(Yii::$app->request->post())) {
$this->trigger(FormEvent::EVENT_BEFORE_REQUEST, $event); $this->trigger(FormEvent::EVENT_BEFORE_REQUEST, $event);
@ -165,7 +165,7 @@ class RecoveryController extends Controller
'module' => $this->module, 'module' => $this->module,
] ]
); );
} } else {var_dump('SHIT!');}
} }
return $this->render('reset', ['model' => $form]); return $this->render('reset', ['model' => $form]);

7
src/User/Validator/AjaxRequestModelValidator.php
View File

@ -30,12 +30,11 @@ class AjaxRequestModelValidator implements ValidatorInterface
{ {
$request = Yii::$app->request; $request = Yii::$app->request;
if ($request->getIsAjax() && !$request->getIsPjax()) { if ($request->getIsAjax() && $this->model->load($request->post())) {
if ($this->model->load($request->post())) {
Yii::$app->response->format = Response::FORMAT_JSON; Yii::$app->response->format = Response::FORMAT_JSON;
echo json_encode(ActiveForm::validate($this->model)); Yii::$app->response->data = ActiveForm::validate($this->model);
Yii::$app->response->send();
Yii::$app->end(); Yii::$app->end();
} }
} }
}
} }