Merge branch 'feature/end-video-popup-28-05-19' into 'master'

попап в конце видео See merge request lilschool/site!313
7 years ago · 52bfd336b8
parent 7186e9ed7b 9366a8ed24
commit 52bfd336b8
1 changed files with 2 additions and 2 deletions
--- a/apps/school/templates/blocks/schedule_item.html
+++ b/apps/school/templates/blocks/schedule_item.html
@ -57,9 +57,9 @@
      </div>
      <div class="timing__content">
      {% if live_lesson and live_lesson.short_description %}
-        {{ live_lesson.short_description }}
+        {{ live_lesson.short_description|safe }}
      {% else %}
-        {{ school_schedule.description }}
+        {{ school_schedule.description|safe }}
      {% endif %}
      </div>
      <div class="timing__more">