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

Refactor DataColum to use model label for sorting link

Browse Source
This commit is contained in:
Carsten Brandt
2013-08-25 00:16:12 +02:00
parent f9fab5d40d
commit c5d65e09af
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
framework/yii/grid/DataColumn.php
View File

@@ -62,25 +62,33 @@ class DataColumn extends Column
if ($this->attribute !== null && $this->header === null) { if ($this->attribute !== null && $this->header === null) {
$provider = $this->grid->dataProvider; $provider = $this->grid->dataProvider;
if ($this->enableSorting && ($sort = $provider->getSort()) !== false && $sort->hasAttribute($this->attribute)) { if ($this->enableSorting && ($sort = $provider->getSort()) !== false && $sort->hasAttribute($this->attribute)) {
if (!isset($sort->attributes[$this->attribute]['label'])) {
$sort->attributes[$this->attribute]['label'] = $this->getHeaderLabel();
}
return $sort->link($this->attribute); return $sort->link($this->attribute);
} }
$models = $provider->getModels(); return $this->getHeaderLabel();
if (($model = reset($models)) instanceof Model) {
/** @var Model $model */
return $model->getAttributeLabel($this->attribute);
} elseif ($provider instanceof ActiveDataProvider) {
if ($provider->query instanceof ActiveQuery) {
/** @var Model $model */
$model = new $provider->query->modelClass;
return $model->getAttributeLabel($this->attribute);
}
}
return Inflector::camel2words($this->attribute);
} else { } else {
return parent::renderHeaderCellContent(); return parent::renderHeaderCellContent();
} }
} }
protected function getHeaderLabel()
{
$provider = $this->grid->dataProvider;
if ($provider instanceof ActiveDataProvider && $provider->query instanceof ActiveQuery) {
/** @var Model $model */
$model = new $provider->query->modelClass;
return $model->getAttributeLabel($this->attribute);
}
$models = $provider->getModels();
if (($model = reset($models)) instanceof Model) {
/** @var Model $model */
return $model->getAttributeLabel($this->attribute);
}
return Inflector::camel2words($this->attribute);
}
protected function renderFilterCellContent() protected function renderFilterCellContent()
{ {
if (is_string($this->filter)) { if (is_string($this->filter)) {