Fixes #6661: Hyperlinks that are enclosed within an exist form will use the same…

framework/CHANGELOG.md

@@ -9,6 +9,7 @@ Yii Framework 2 Change Log
 - Enh #6493: Added support for the `Access-Control-Expose-Headers` header by `yii\filters\Cors` (usualdesigner)
 - Enh #6697: Added `yii\helpers\Url::current()` method that allows adding or removing parameters from current URL (samdark, callmez)
 - Chg #5690: adjusted paths in message config generated by `yii message/config` to reflect directory structure better (mikehaertl, samdark)
+- Chg #6661: Hyperlinks that are enclosed within an exist form will use the same form for submission if they specify both of the `href` and `data-method` attributes (qiangxue)
 
 
 2.0.2 January 11, 2015

framework/assets/yii.js

@@ -158,7 +158,7 @@ yii = (function ($) {
                 return;
             }
 
-            var newForm = !$form.length || action && action != '#';
+            var newForm = !$form.length;
             if (newForm) {
                 if (!action || !action.match(/(^\/|:\/\/)/)) {
                     action = window.location.href;
@@ -197,9 +197,17 @@ yii = (function ($) {
 
             var oldMethod = $form.prop('method');
             $form.prop('method', method);
+            var oldAction = null;
+            if (action && action != '#') {
+                oldAction = $form.prop('action');
+                $form.prop('action', action);
+            }
 
             $form.trigger('submit');
 
+            if (oldAction != null) {
+                $form.prop('action', oldAction);
+            }
             $form.prop('method', oldMethod);
 
             // remove the temporarily added hidden inputs