Modified grid columns

Author: pierredup

src/CS/DataGridBundle/Grid/Collection.php

@@ -98,7 +98,7 @@ public function addRecursive($data = array())
     {
         if (is_array($data) && !empty($data)) {
             foreach ($data as $key => $column) {
-                $this->add($column, $key);
+                $this->add($column, null, $key);
             }
         }
 

src/CS/DataGridBundle/Grid/Column/ColumnCollection.php

@@ -21,10 +21,10 @@ class ColumnCollection extends Collection
      * @param string  $label
      * @param integer $priority
      */
-    public function add($label, $priority = 0)
+    public function add($label, $callback = null, $priority = 0)
     {
         // TODO: get column  class from configuration
-        $column = new Column ($label);
+        $column = new Column ($label, $callback);
 
         $this->offsetSet($priority, $column);
 

src/CS/DataGridBundle/Grid/Grid.php

@@ -33,7 +33,7 @@ class Grid
      */
     protected $grid;
 
-    public static $columnCollection;
+    public $columnCollection;
 
     /**
      * Constructor
@@ -122,7 +122,7 @@ public function setGrid(GridInterface $grid)
     {
         $this->grid = $grid;
 
-        //$grid->setContainer($this->getContainer());
+        $grid->setContainer($this->getContainer());
         return $this;
     }
 
@@ -136,17 +136,22 @@ public function getContainer()
         return $this->container;
     }
 
-    public function getColumns()
+    protected function fetchColumns()
     {
-        if (!self::$columnCollection) {
-            self::$columnCollection = new ColumnCollection;
+    	if(!$this->columnCollection instanceof ColumnCollection)
+    	{
+    		$this->columnCollection = new ColumnCollection;
 
-            self::$columnCollection->addRecursive($this->data->getColumns());
+    		$this->columnCollection->addRecursive($this->data->getColumns());
 
-            $this->grid->getColumns(self::$columnCollection);
-        }
+        	$this->grid->getColumns($this->columnCollection);
+    	}
+    }
 
-        return self::$columnCollection;
+    public function getColumns()
+    {
+    	$this->fetchColumns();
+        return $this->columnCollection;
     }
 
     public function getActions()

src/CS/DataGridBundle/Grid/Row.php

@@ -122,7 +122,10 @@ public function offsetExists($offset)
         try {
             $val = $this->getValue($offset);
         } catch (\Exception $e) {
-            return false;
+
+        	$cols = $this->getGrid()->getColumns();
+
+        	return is_object($cols[$offset]);
         }
 
         return true;