From 7d494c1915f4c1d4be1d2487d504b53dc2c538b6 Mon Sep 17 00:00:00 2001 From: SilverFire - Dmitry Naumenko Date: Sun, 11 Dec 2016 21:04:12 +0200 Subject: [PATCH] Fixed unexpected form submit on `validate()` call Fixed `validate()` method in `yii.activeForm.js` to prevent unexpected form submit when `forceValidate` set to `true` Closes #13105 --- framework/CHANGELOG.md | 1 + framework/assets/yii.activeForm.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index ab56c12..ed7b3f0 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -30,6 +30,7 @@ Yii Framework 2 Change Log - Bug #13159: Fixed `destroy` method in `yii.captcha.js` which did not work as expected (arogachev) - Bug #7727: Fixed truncateHtml leaving extra tags (developeruz) - Bug #13118: Fixed `handleAction()` function in `yii.js` to handle attribute `data-pjax=0` as disabled PJAX (silverfire) +- Bug #13105: Fixed `validate()` method in `yii.activeForm.js` to prevent unexpected form submit when `forceValidate` set to `true` (silverfire) - Enh #475: Added Bash and Zsh completion support for the `./yii` command (cebe, silverfire) - Enh #6242: Access to validator in inline validation (arogachev) - Enh #6373: Introduce `yii\db\Query::emulateExecution()` to force returning an empty result for a query (klimov-paul) diff --git a/framework/assets/yii.activeForm.js b/framework/assets/yii.activeForm.js index 789cb27..bb39f85 100644 --- a/framework/assets/yii.activeForm.js +++ b/framework/assets/yii.activeForm.js @@ -306,9 +306,9 @@ needAjaxValidation = false, messages = {}, deferreds = deferredArray(), - submitting = data.submitting; + submitting = data.submitting && !forceValidate; - if (submitting) { + if (data.submitting) { var event = $.Event(events.beforeValidate); $form.trigger(event, [messages, deferreds]);