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

Merge pull request #972 from cebe/grid-filter-only-active

Browse Source 
Filter only active attributes in gridview
This commit is contained in:
Qiang Xue
2013-10-13 11:56:04 -07:00
parent 4050a4b211 5ad8fe5f45
commit f2e245feb4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,9 @@ class DataColumn extends Column
{ {
if (is_string($this->filter)) { if (is_string($this->filter)) {
return $this->filter; return $this->filter;
} elseif ($this->filter !== false && $this->grid->filterModel instanceof Model && $this->attribute !== null) { } elseif ($this->filter !== false && $this->grid->filterModel instanceof Model &&
$this->attribute !== null && $this->grid->filterModel->isAttributeActive($this->attribute))
{
if (is_array($this->filter)) { if (is_array($this->filter)) {
$options = array_merge(array('prompt' => ''), $this->filterInputOptions); $options = array_merge(array('prompt' => ''), $this->filterInputOptions);
return Html::activeDropDownList($this->grid->filterModel, $this->attribute, $this->filter, $options); return Html::activeDropDownList($this->grid->filterModel, $this->attribute, $this->filter, $options);