php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-20 16:38:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2225 from thiagotalma/master

Browse Source 
Allow to set an attribute as the value of the cell, unlike the column attribute
This commit is contained in:
Qiang Xue
2014-01-30 13:36:44 -08:00
parent e68313717f 8c49dabb1b
commit 2b507253aa
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/grid/DataColumn.php
View File

@@ -40,7 +40,8 @@ class DataColumn extends Column
*/ */
public $label; public $label;
/** /**
* @var \Closure an anonymous function that returns the value to be displayed for every data model. * @var string|\Closure the attribute name to be displayed in this column or an anonymous function that returns
* the value to be displayed for every data model.
* The signature of this function is `function ($model, $index, $widget)`. * The signature of this function is `function ($model, $index, $widget)`.
* If this is not set, `$model[$attribute]` will be used to obtain the value. * If this is not set, `$model[$attribute]` will be used to obtain the value.
*/ */
@@ -140,7 +141,11 @@ class DataColumn extends Column
protected function renderDataCellContent($model, $key, $index) protected function renderDataCellContent($model, $key, $index)
{ {
if ($this->value !== null) { if ($this->value !== null) {
if (is_string($this->value)) {
$value = ArrayHelper::getValue($model, $this->value);
} else {
$value = call_user_func($this->value, $model, $index, $this); $value = call_user_func($this->value, $model, $index, $this);
}
} elseif ($this->content === null && $this->attribute !== null) { } elseif ($this->content === null && $this->attribute !== null) {
$value = ArrayHelper::getValue($model, $this->attribute); $value = ArrayHelper::getValue($model, $this->attribute);
} else { } else {