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 #10631: Splitted gettng label and rendering cell in yii\grid\DataColumn::renderHeaderCellContent() to make code simpler

Browse Source
This commit is contained in:
Konstantin Timoshenko
2016-01-27 21:44:08 +03:00
committed by Alexander Makarov
parent 6dd017c2a3
commit b5b55ad302
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/grid/Column.php
View File

@ -124,7 +124,17 @@ class Column extends Object
*/
protected function renderHeaderCellContent()
{
return trim($this->header) !== '' ? $this->header : $this->grid->emptyCell;
return trim($this->header) !== '' ? $this->header : $this->getHeaderCellLabel();
}
/**
* Returns header cell label.
* This method may be overridden to customize the label of the header cell.
* @return string label
*/
protected function getHeaderCellLabel()
{
return $this->grid->emptyCell;
}
/**

22
framework/grid/DataColumn.php
View File

@ -117,6 +117,21 @@ class DataColumn extends Column
return parent::renderHeaderCellContent();
}
$label = $this->getHeaderCellLabel();
if ($this->attribute !== null && $this->enableSorting &&
($sort = $this->grid->dataProvider->getSort()) !== false && $sort->hasAttribute($this->attribute)) {
return $sort->link($this->attribute, array_merge($this->sortLinkOptions, ['label' => ($this->encodeLabel ? Html::encode($label) : $label)]));
} else {
return $this->encodeLabel ? Html::encode() : $label;
}
}
/**
* @inheritdoc
*/
protected function getHeaderCellLabel()
{
$provider = $this->grid->dataProvider;
if ($this->label === null) {
@ -137,12 +152,7 @@ class DataColumn extends Column
$label = $this->label;
}
if ($this->attribute !== null && $this->enableSorting &&
($sort = $provider->getSort()) !== false && $sort->hasAttribute($this->attribute)) {
return $sort->link($this->attribute, array_merge($this->sortLinkOptions, ['label' => $this->encodeLabel ? Html::encode($label) : $label]));
} else {
return $this->encodeLabel ? Html::encode($label) : $label;
}
return $label;
}
/**