Commit f1812210 by Qiang Xue

Fixes #5768: When setting `data-confirm` attribute to a submit button, clicking…

Fixes #5768: When setting `data-confirm` attribute to a submit button, clicking on the button would not trigger form submission
parent 8923d20a
...@@ -16,6 +16,7 @@ Yii Framework 2 Change Log ...@@ -16,6 +16,7 @@ Yii Framework 2 Change Log
- Bug #5682: The `asset` command would incorrectly combine CSS files when `UrlManager::linkAssets` is true (dmvslv) - Bug #5682: The `asset` command would incorrectly combine CSS files when `UrlManager::linkAssets` is true (dmvslv)
- Bug #5702: Parenthesis should be automatically added to `Validator::whenClient` to avoid js error (mdmunir, qiangxue) - Bug #5702: Parenthesis should be automatically added to `Validator::whenClient` to avoid js error (mdmunir, qiangxue)
- Bug #5745: Gii and debug modules may cause 404 exception when the route contains dashes (qiangxue) - Bug #5745: Gii and debug modules may cause 404 exception when the route contains dashes (qiangxue)
- Bug #5768: When setting `data-confirm` attribute to a submit button, clicking on the button would not trigger form submission (qiangxue)
- Bug #5780: `QueryBuilder::batchInsert()` may cause "undefined index" error (qiangxue) - Bug #5780: `QueryBuilder::batchInsert()` may cause "undefined index" error (qiangxue)
- Bug #5833: The `message` command fails with a FK constraint error when trying to update messages (qiangxue) - Bug #5833: The `message` command fails with a FK constraint error when trying to update messages (qiangxue)
- Bug #5893: `yii\helpers\ArrayHelper::toArray()` now applies `$properties` parameter for converting descending objects in recursive calls (otsec) - Bug #5893: `yii\helpers\ArrayHelper::toArray()` now applies `$properties` parameter for converting descending objects in recursive calls (otsec)
......
...@@ -131,6 +131,8 @@ yii = (function ($) { ...@@ -131,6 +131,8 @@ yii = (function ($) {
if (method === undefined) { if (method === undefined) {
if (action && action != '#') { if (action && action != '#') {
window.location = action; window.location = action;
} else if ($e.filter(':submit') && $form.length) {
$form.trigger('submit');
} }
return; return;
} }
......
...@@ -270,7 +270,6 @@ abstract class Target extends Component ...@@ -270,7 +270,6 @@ abstract class Target extends Component
$ip = $request instanceof Request ? $request->getUserIP() : '-'; $ip = $request instanceof Request ? $request->getUserIP() : '-';
/* @var $user \yii\web\User */ /* @var $user \yii\web\User */
$user = Yii::$app->has('user', true) ? Yii::$app->get('user') : null; $user = Yii::$app->has('user', true) ? Yii::$app->get('user') : null;
if ($user && ($identity = $user->getIdentity(false))) { if ($user && ($identity = $user->getIdentity(false))) {
$userID = $identity->getId(); $userID = $identity->getId();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment