use selectParts instead of uniqueId in array

ThaDafinser · Sep 1, 2015 · 2cad7f3 · 2cad7f3
1 parent d98f053
commit 2cad7f3
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/ZfcDatagrid/DataSource/PhpArray.php b/src/ZfcDatagrid/DataSource/PhpArray.php
@@ -2,6 +2,7 @@
 namespace ZfcDatagrid\DataSource;
 
 use Zend\Paginator\Adapter\ArrayAdapter as PaginatorAdapter;
+use ZfcDatagrid\Column;
 
 class PhpArray extends AbstractDataSource
 {
@@ -68,8 +69,17 @@ public function execute()
          * @todo ? Better performance or let it be?
          */
         $selectedColumns = [];
-        foreach ($this->getColumns() as $column) {
-            $selectedColumns[] = $column->getUniqueId();
+        foreach ($this->getColumns() as $col) {
+            if (!$col instanceof Column\Select) {
+                continue;
+            }
+
+            $colString = $col->getSelectPart1();
+            if ($col->getSelectPart2() != '') {
+                $colString = $col->getSelectPart1() . '_' . $col->getSelectPart2();
+            }
+
+            $selectedColumns[] = $colString;
         }
 
         foreach ($data as &$row) {