Merge pull request #658 from Bruce17/patch-5

Fix ActionColumn route parameters handling
stwe · Aug 6, 2017 · 55c220b · 55c220b
2 parents 57ca0b8 + e70e7c0
commit 55c220b
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Datatable/Column/ActionColumn.php b/Datatable/Column/ActionColumn.php
@@ -90,7 +90,14 @@ public function renderSingleField(array &$row)
                     if (isset($row[$value])) {
                         $parameters[$actionKey][$key] = $row[$value];
                     } else {
-                        $parameters[$actionKey][$key] = $value;
+                        $path = Helper::getDataPropertyPath($value);
+                        $entry = $this->accessor->getValue($row, $path);
+
+                        if (!empty($entry)) {
+                            $parameters[$actionKey][$key] = $entry;
+                        } else {
+                            $parameters[$actionKey][$key] = $value;
+                        }
                     }
                 }
             } elseif ($routeParameters instanceof Closure) {