Feature/bap 16541 2.6 (#16926)

* BAP-16543: Review and fix renderHtmlProperty usages (#16598) * BAP-16543: Review and fix renderHtmlProperty usages * BAP-16543: Review and fix renderHtmlProperty usages * BAP-16543: Review and fix renderHtmlProperty usages * BAP-16545: Fix comments rendering with JS template (#16609)
oroinc · Feb 23, 2018 · 0773a95 · 0773a95
1 parent df3b03e
commit 0773a95
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Resources/views/CalendarEvent/view.html.twig b/Resources/views/CalendarEvent/view.html.twig
@@ -63,7 +63,7 @@
         <div class="row-fluid form-horizontal">
             <div class="responsive-block">
                 {{ UI.renderProperty('oro.calendar.calendarevent.title.label'|trans, entity.title) }}
-                {{ UI.renderHtmlProperty('oro.calendar.calendarevent.description.label'|trans, entity.description|raw|nl2br) }}
+                {{ UI.renderSwitchableHtmlProperty('oro.calendar.calendarevent.description.label'|trans, entity.description) }}
                 {{ UI.renderProperty('oro.calendar.calendarevent.start.label'|trans, entity.start|oro_format_datetime) }}
                 {{ UI.renderProperty('oro.calendar.calendarevent.end.label'|trans, entity.end|oro_format_datetime) }}
                 {{ UI.renderProperty('oro.calendar.calendarevent.all_day.label'|trans, entity.allDay ? 'Yes'|trans : 'No'|trans) }}

diff --git a/Resources/views/CalendarEvent/widget/info.html.twig b/Resources/views/CalendarEvent/widget/info.html.twig
@@ -10,7 +10,7 @@
             </div>
         {% endif %}
         {{ UI.renderProperty('oro.calendar.calendarevent.title.label'|trans, entity.title) }}
-        {{ UI.renderHtmlProperty('oro.calendar.calendarevent.description.label'|trans, entity.description) }}
+        {{ UI.renderSwitchableHtmlProperty('oro.calendar.calendarevent.description.label'|trans, entity.description) }}
         {{ UI.renderProperty('oro.calendar.calendarevent.start.label'|trans, entity.start|oro_format_datetime) }}
         {{ UI.renderProperty('oro.calendar.calendarevent.end.label'|trans, entity.end|oro_format_datetime) }}
         {{ UI.renderProperty('oro.calendar.calendarevent.all_day.label'|trans, entity.allDay ? 'Yes'|trans : 'No'|trans) }}

diff --git a/Resources/views/SystemCalendarEvent/view.html.twig b/Resources/views/SystemCalendarEvent/view.html.twig
@@ -54,7 +54,7 @@
         <div class="row-fluid form-horizontal">
             <div class="responsive-block">
                 {{ UI.renderProperty('oro.calendar.calendarevent.title.label'|trans, entity.title) }}
-                {{ UI.renderHtmlProperty('oro.calendar.calendarevent.description.label'|trans, entity.description) }}
+                {{ UI.renderSwitchableHtmlProperty('oro.calendar.calendarevent.description.label'|trans, entity.description) }}
                 {{ UI.renderProperty('oro.calendar.calendarevent.start.label'|trans, entity.start|oro_format_datetime) }}
                 {{ UI.renderProperty('oro.calendar.calendarevent.end.label'|trans, entity.end|oro_format_datetime) }}
                 {{ UI.renderProperty('oro.calendar.calendarevent.all_day.label'|trans, entity.allDay ? 'Yes'|trans : 'No'|trans) }}