Merge branch 'master' of https://github.com/ThaDafinser/ZfcDatagrid i…

…nto feature/dynamicLabel
ThaDafinser · Aug 31, 2015 · 5ca1fc0 · 5ca1fc0
2 parents 6562180 + 6462985
commit 5ca1fc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/ZfcDatagrid/Column/Action/Button.php b/src/ZfcDatagrid/Column/Action/Button.php
@@ -12,6 +12,7 @@ public function __construct()
         parent::__construct();
 
         $this->addClass('btn');
+        $this->addClass('btn-default');
     }
 
     /**

diff --git a/src/ZfcDatagrid/PrepareData.php b/src/ZfcDatagrid/PrepareData.php
@@ -141,6 +141,8 @@ public function prepare()
         $data = $this->data;
 
         foreach ($data as $key => &$row) {
+            $row = (array) $row;
+
             $ids = [];
 
             foreach ($this->getColumns() as $col) {
@@ -224,7 +226,7 @@ public function prepare()
                  */
                 if ($col->hasFormatters() === true) {
                     foreach ($col->getFormatters() as $formatter) {
-                        $formatter->setRowData((array) $row);
+                        $formatter->setRowData($row);
                         $formatter->setRendererName($this->getRendererName());
 
                         $row[$col->getUniqueId()] = $formatter->format($col);
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ public function __construct() @@
             parent::__construct();
             $this->addClass('btn');
+            $this->addClass('btn-default');
         }
         /**
@@ Expand Down @@