Fix closure on attributes action option

Author: Seb33300

Datatable/Column/ActionColumn.php

@@ -81,13 +81,14 @@ public function addDataToOutputArray(array &$row)
     public function renderSingleField(array &$row)
     {
         $parameters = array();
+        $attributes = array();
         $values = array();
 
         /** @var Action $action */
         foreach ($this->actions as $actionKey => $action) {
             $routeParameters = $action->getRouteParameters();
             if (is_array($routeParameters)) {
-                    foreach ($routeParameters as $key => $value) {
+                foreach ($routeParameters as $key => $value) {
                     if (isset($row[$value])) {
                         $parameters[$actionKey][$key] = $row[$value];
                     } else {
@@ -108,8 +109,12 @@ public function renderSingleField(array &$row)
             }
 
             $actionAttributes = $action->getAttributes();
-            if ($actionAttributes instanceof Closure) {
-                $action->setAttributes(call_user_func($actionAttributes, $row));
+            if (is_array($actionAttributes)) {
+                $attributes[$actionKey] = $actionAttributes;
+            } elseif ($actionAttributes instanceof Closure) {
+                $attributes[$actionKey] = call_user_func($actionAttributes, $row);
+            } else {
+                $attributes[$actionKey] = array();
             }
 
             if ($action->isButton()) {
@@ -138,6 +143,7 @@ public function renderSingleField(array &$row)
             array(
                 'actions' => $this->actions,
                 'route_parameters' => $parameters,
+                'attributes' => $attributes,
                 'values' => $values,
                 'render_if_actions' => $row['sg_datatables_actions'][$this->index],
                 'start_html_container' => $this->startHtml,

Resources/views/render/action.html.twig

@@ -20,8 +20,8 @@
     {% endif %}
 {% endmacro %}
 
-{% macro attributes(action) %}
-    {% for key, value in action.attributes %}
+{% macro attributes(attributes) %}
+    {% for key, value in attributes %}
         {{ key }}="{{ value }}"
     {% endfor %}
 {% endmacro %}
@@ -64,13 +64,13 @@
     {% if render_if_actions[actionKey] is same as(true) %}
         {% if action.button is same as(false) %}
             {{ action.startHtml|raw }}
-            <a {{ macros.href(action, route_parameters[actionKey]) }} {{ macros.attributes(action) }} {{ macros.confirm_dialog(action) }}>
+            <a {{ macros.href(action, route_parameters[actionKey]) }} {{ macros.attributes(attributes[actionKey]) }} {{ macros.confirm_dialog(action) }}>
                 {{ macros.link_title(action) }}
             </a>
             {{ action.endHtml|raw }}
         {% else %}
             {{ action.startHtml|raw }}
-            <button type="button" {{ macros.value(values[actionKey]) }} {{ macros.attributes(action) }} {{ macros.confirm_dialog(action) }}>
+            <button type="button" {{ macros.value(values[actionKey]) }} {{ macros.attributes(attributes[actionKey]) }} {{ macros.confirm_dialog(action) }}>
                 {{ macros.link_title(action) }}
             </button>
             {{ action.endHtml|raw }}