Fix double quotes in html + allow html in default content

stwe · Aug 25, 2018 · 4bb03c8 · 4bb03c8
1 parent df8dd57
commit 4bb03c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Resources/views/column/column.html.twig b/Resources/views/column/column.html.twig
@@ -15,7 +15,7 @@
             "contentPadding": "{{ column.contentPadding }}",
         {% endif %}
         {% if column.defaultContent is not same as(null) %}
-            "defaultContent": "{{ column.defaultContent }}",
+            "defaultContent": {{ column.defaultContent|json_encode|raw }},
         {% endif %}
         {% if column.name is not same as(null) %}
             "name": "{{ column.name }}",
@@ -25,7 +25,7 @@
         {% endif %}
         {% block title %}
             {% if column.title is not same as(null) %}
-                "title": "{{ column.title|raw }}",
+                "title": {{ column.title|json_encode|raw }},
             {% endif %}
         {% endblock %}
         {% if column.searchable is same as(true) or column.searchable is same as(false) %}