fix(#72): column header, value and action blocks using incorrect temp…

…late when used with custom theme (#73)
Kreyu · Mar 22, 2024 · 5e3f5a2 · 5e3f5a2
1 parent 0d53e81
commit 5e3f5a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Resources/views/themes/base.html.twig b/src/Resources/views/themes/base.html.twig
@@ -109,15 +109,15 @@
 {% endblock %}
 
 {% block kreyu_data_table_column_header %}
-    {{ block(block_name, theme) }}
+    {{ block(block_name, block_theme) }}
 {% endblock %}
 
 {% block kreyu_data_table_column_value %}
-    {{ block(block_name, theme) }}
+    {{ block(block_name, block_theme) }}
 {% endblock %}
 
 {% block kreyu_data_table_action %}
-    {% if visible %}{{- block(block_name, theme) -}}{% endif %}
+    {% if visible %}{{- block(block_name, block_theme) -}}{% endif %}
 {% endblock %}
 
 {# Pagination #}

diff --git a/src/Twig/DataTableExtension.php b/src/Twig/DataTableExtension.php
@@ -350,8 +350,8 @@ private function getDecoratedViewContext(Environment $environment, ColumnHeaderV
                 $wrapper = $environment->load($theme);
 
                 if ($wrapper->hasBlock($blockName, $context)) {
-                    $context['theme'] = $theme;
                     $context['block_name'] = $blockName;
+                    $context['block_theme'] = $theme;
 
                     break 2;
                 }