php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #5688: Added optional $formName to Model::loadMultiple() to support customizing form name directly

Browse Source
This commit is contained in:
Qiang Xue
2014-11-07 10:47:38 -05:00
parent 6ada8737fd
commit fe546cd22f
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -32,6 +32,7 @@ Yii Framework 2 Change Log
- Enh #5600: Allow configuring debug panels in `yii\debug\Module::panels` as panel class name strings (qiangxue) - Enh #5600: Allow configuring debug panels in `yii\debug\Module::panels` as panel class name strings (qiangxue)
- Enh #5613: Added `--overwrite` option to Gii console command to support overwriting all files (motin, qiangxue) - Enh #5613: Added `--overwrite` option to Gii console command to support overwriting all files (motin, qiangxue)
- Enh #5646: Call `yii\base\ErrorHandler::unregister()` instead of `restore_*_handlers` directly (aivus) - Enh #5646: Call `yii\base\ErrorHandler::unregister()` instead of `restore_*_handlers` directly (aivus)
- Enh #5688: Added optional `$formName` to `Model::loadMultiple()` to support customizing form name directly (qiangxue)
- Enh #5735: Added `yii\bootstrap\Tabs::renderTabContent` to support manually rendering tab contents (RomeroMsk) - Enh #5735: Added `yii\bootstrap\Tabs::renderTabContent` to support manually rendering tab contents (RomeroMsk)
- Enh #5770: Added more PHP error names for `ErrorException` (mongosoft) - Enh #5770: Added more PHP error names for `ErrorException` (mongosoft)
- Enh #5806: Allow `Html::encode()` to be used when the application is not started (qiangxue) - Enh #5806: Allow `Html::encode()` to be used when the application is not started (qiangxue)

30
framework/base/Model.php
View File

@ -763,25 +763,31 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
* @param array $models the models to be populated. Note that all models should have the same class. * @param array $models the models to be populated. Note that all models should have the same class.
* @param array $data the data array. This is usually `$_POST` or `$_GET`, but can also be any valid array * @param array $data the data array. This is usually `$_POST` or `$_GET`, but can also be any valid array
* supplied by end user. * supplied by end user.
* @return boolean whether the model is successfully populated with some data. * @param string $formName the form name to be used for loading the data into the models.
* If not set, it will use the [[formName()]] value of the first model in `$models`.
* @return boolean whether at least one of the models is successfully populated.
*/ */
public static function loadMultiple($models, $data) public static function loadMultiple($models, $data, $formName = null)
{ {
/* @var $model Model */ if ($formName === null) {
$model = reset($models); /* @var $first Model */
if ($model === false) { $first = reset($models);
return false; if ($first === false) {
return false;
}
$formName = $first->formName();
} }
$success = false; $success = false;
$scope = $model->formName();
foreach ($models as $i => $model) { foreach ($models as $i => $model) {
if ($scope == '') { /* @var $model Model */
if (isset($data[$i])) { if ($formName == '') {
$model->setAttributes($data[$i]); if (!empty($data[$i])) {
$model->load($data[$i], '');
$success = true; $success = true;
} }
} elseif (isset($data[$scope][$i])) { } elseif (!empty($data[$formName][$i])) {
$model->setAttributes($data[$scope][$i]); $model->load($data[$formName][$i], '');
$success = true; $success = true;
} }
} }