php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-23 12:10:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

The signature for yii\gridview\ActionColumn::urlCreator is changed - the $action parameter is moved to the first

Browse Source
This commit is contained in:
Qiang Xue
2013-12-25 23:36:28 -05:00
parent ab05f0d791
commit bae5cda5b9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -38,6 +38,7 @@ Yii Framework 2 Change Log
- Chg: Renamed `ActiveRecord::getPopulatedRelations()` to `getRelatedRecords()` (qiangxue) - Chg: Renamed `ActiveRecord::getPopulatedRelations()` to `getRelatedRecords()` (qiangxue)
- Chg: Renamed `attributeName` and `className` to `targetAttribute` and `targetClass` for `UniqueValidator` and `ExistValidator` (qiangxue) - Chg: Renamed `attributeName` and `className` to `targetAttribute` and `targetClass` for `UniqueValidator` and `ExistValidator` (qiangxue)
- Chg: Added `yii\widgets\InputWidget::options` (qiangxue) - Chg: Added `yii\widgets\InputWidget::options` (qiangxue)
- Chg: The signature for `yii\gridview\ActionColumn::urlCreator` is changed - the `$action` parameter is moved to the first (qiangxue)
- New #1438: [MongoDB integration](https://github.com/yiisoft/yii2-mongodb) ActiveRecord and Query (klimov-paul) - New #1438: [MongoDB integration](https://github.com/yiisoft/yii2-mongodb) ActiveRecord and Query (klimov-paul)
- New #1393: [Codeception testing framework integration](https://github.com/yiisoft/yii2-codeception) (Ragazzo) - New #1393: [Codeception testing framework integration](https://github.com/yiisoft/yii2-codeception) (Ragazzo)

6
framework/yii/grid/ActionColumn.php
View File

@ -70,16 +70,16 @@ class ActionColumn extends Column
} }
/** /**
* @param string $action
* @param \yii\db\ActiveRecord $model * @param \yii\db\ActiveRecord $model
* @param mixed $key the key associated with the data model * @param mixed $key the key associated with the data model
* @param integer $index * @param integer $index
* @param string $action
* @return string * @return string
*/ */
public function createUrl($model, $key, $index, $action) public function createUrl($action, $model, $key, $index)
{ {
if ($this->urlCreator instanceof Closure) { if ($this->urlCreator instanceof Closure) {
return call_user_func($this->urlCreator, $model, $key, $index, $action); return call_user_func($this->urlCreator, $action, $model, $key, $index);
} else { } else {
$params = is_array($key) ? $key : ['id' => $key]; $params = is_array($key) ? $key : ['id' => $key];
$route = $this->controller ? $this->controller . '/' . $action : $action; $route = $this->controller ? $this->controller . '/' . $action : $action;