Commit 155f525e by Qiang Xue

Fixes #2380: `yii\widgets\ActiveForm` will register validation js even if there…

Fixes #2380: `yii\widgets\ActiveForm` will register validation js even if there are not fields inside
parent d5077d70
...@@ -216,6 +216,7 @@ Yii Framework 2 Change Log ...@@ -216,6 +216,7 @@ Yii Framework 2 Change Log
- Enh: ListView now uses the widget ID in the base tag, consistent to gridview (cebe) - Enh: ListView now uses the widget ID in the base tag, consistent to gridview (cebe)
- Enh: Added `yii\web\Response::enableCsrfCookie` to support storing CSRF tokens in session (qiangxue) - Enh: Added `yii\web\Response::enableCsrfCookie` to support storing CSRF tokens in session (qiangxue)
- Chg #2287: Split `yii\db\ColumnSchema::typecast()` into two methods `phpTypecast()` and `dbTypecast()` to allow specifying PDO type explicitly (cebe) - Chg #2287: Split `yii\db\ColumnSchema::typecast()` into two methods `phpTypecast()` and `dbTypecast()` to allow specifying PDO type explicitly (cebe)
- Chg #2380: `yii\widgets\ActiveForm` will register validation js even if there are not fields inside (qiangxue)
- Chg #2898: `yii\console\controllers\AssetController` is now using hashes instead of timestamps (samdark) - Chg #2898: `yii\console\controllers\AssetController` is now using hashes instead of timestamps (samdark)
- Chg #2913: RBAC `DbManager` is now initialized via migration (samdark) - Chg #2913: RBAC `DbManager` is now initialized via migration (samdark)
- Chg #3036: Upgraded Twitter Bootstrap to 3.1.x (qiangxue) - Chg #3036: Upgraded Twitter Bootstrap to 3.1.x (qiangxue)
......
...@@ -250,14 +250,13 @@ class ActiveForm extends Widget ...@@ -250,14 +250,13 @@ class ActiveForm extends Widget
throw new InvalidCallException('Each beginField() should have a matching endField() call.'); throw new InvalidCallException('Each beginField() should have a matching endField() call.');
} }
if (!empty($this->attributes)) { $id = $this->options['id'];
$id = $this->options['id']; $options = Json::encode($this->getClientOptions());
$options = Json::encode($this->getClientOptions()); $attributes = Json::encode($this->attributes);
$attributes = Json::encode($this->attributes); $view = $this->getView();
$view = $this->getView(); ActiveFormAsset::register($view);
ActiveFormAsset::register($view); $view->registerJs("jQuery('#$id').yiiActiveForm($attributes, $options);");
$view->registerJs("jQuery('#$id').yiiActiveForm($attributes, $options);");
}
echo Html::endForm(); echo Html::endForm();
} }
......
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