From 5a2f1557659e297787b849dfb3015d29193b0cac Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Mon, 3 Jun 2019 09:23:09 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D0=B0=D0=BF=20=D0=B2=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=86=D0=B5=20=D0=B2=D0=B8=D0=B4=D0=B5=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/content/templates/content/blocks/video.html | 4 ++--
 apps/school/templates/blocks/schedule_item.html  | 4 +---
 apps/user/templates/user/profile.html            | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/content/templates/content/blocks/video.html b/apps/content/templates/content/blocks/video.html
index 16b13a4b..da44d655 100644
--- a/apps/content/templates/content/blocks/video.html
+++ b/apps/content/templates/content/blocks/video.html
@@ -6,11 +6,11 @@
     <div class="content-block__video iframe__container">
       {% if content.is_youtube_video %}
       <iframe class="js-video" data-is-youtube="1" src="https://www.youtube.com/embed/{{ content.video_index }}"
-              data-course-id="{{ content.course_id|default:'' }}"
+              data-course-id="{% if content.lesson_id %}{{ content.lesson.course_id }}{% else %}{{ content.course_id|default:'' }}{% endif %}"
               frameborder="0" allow="autoplay; encrypted-media" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
       {% elif content.is_vimeo_video %}
       <iframe class="js-video" data-is-vimeo="1" src="https://player.vimeo.com/video/{{ content.video_index }}"
-              data-course-id="{{ content.course_id|default:'' }}"
+              data-course-id="{% if content.lesson_id %}{{ content.lesson.course_id }}{% else %}{{ content.course_id|default:'' }}{% endif %}"
               frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen>
       </iframe>
       {% endif %}
diff --git a/apps/school/templates/blocks/schedule_item.html b/apps/school/templates/blocks/schedule_item.html
index 4de76462..b2a48238 100644
--- a/apps/school/templates/blocks/schedule_item.html
+++ b/apps/school/templates/blocks/schedule_item.html
@@ -56,13 +56,11 @@
         {% endif %}
       </div>
       <div class="timing__content">
-      {% comment %}
       {% if live_lesson and live_lesson.short_description %}
         {{ live_lesson.short_description }}
       {% else %}
-      {% endcomment %}
         {{ school_schedule.description }}
-      {% comment %}{% endif %}{% endcomment %}
+      {% endif %}
       </div>
       <div class="timing__more">
         <div class="timing__head">Материалы</div>
diff --git a/apps/user/templates/user/profile.html b/apps/user/templates/user/profile.html
index 6df83e4a..074bf1d3 100644
--- a/apps/user/templates/user/profile.html
+++ b/apps/user/templates/user/profile.html
@@ -142,7 +142,7 @@
               {% if paid.exists %}
               {% include "course/course_items.html" with course_items=paid %}
               {% endif %}
-              {% if not is_school_purchased and not paid.exists and not user_gift_certificates.exists %}
+              {% if not is_school_purchased and not is_camp_purchased and not paid.exists and not user_gift_certificates.exists %}
               <div class="center center_xs">
                 <div class="done">
                   <div class="done__title">Вы пока ничего не приобрели...</div>