diff --git a/GridViewTrait.php b/GridViewTrait.php index cf6f658..e4a624c 100644 --- a/GridViewTrait.php +++ b/GridViewTrait.php @@ -14,6 +14,7 @@ * filterYesNo * quickAction * filterDatepicker + * gridColumnTemp * */ @@ -142,4 +143,23 @@ public function filterDatepicker($model, $attribute, $filter=true) return CHtml::activeDateField($model, $attribute, $options); } } + + /** + * gridColumnTemp + * + * @return array + */ + public function gridColumnTemp() + { + $gridColumn = Yii::app()->getRequest()->getParam('GridColumn'); + $columnTemp = array(); + if($gridColumn) { + foreach($gridColumn as $key => $val) { + if($gridColumn[$key] == 1) + $columnTemp[] = $key; + } + } + + return $columnTemp; + } } diff --git a/system/OActiveRecord.php b/system/OActiveRecord.php index 61af7a9..96a7027 100644 --- a/system/OActiveRecord.php +++ b/system/OActiveRecord.php @@ -42,9 +42,9 @@ public function getGridColumn($columns=null) } return $this->defaultColumns; } - + foreach($columns as $val) { - if(!in_array($val, $this->gridForbiddenColumn) && !in_array($val, $this->defaultColumns)) { + if(array_key_exists($val, $this->templateColumns) && !in_array($val, $this->defaultColumns)) { $col = $this->getTemplateColumn($val); if($col != null) $this->defaultColumns[] = $col;