move gridColumnTemp to traits

ommu · Jul 16, 2018 · 62030c1 · 62030c1
1 parent 42b3760
commit 62030c1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git 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
@@ -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;