Merge branch 'hotfix/shedules-fix' into 'master'

Hotfix/shedules fix

See merge request lilschool/site!389

api/v1/serializers/school.py

@@ -76,18 +76,18 @@ class SchoolScheduleSerializer(serializers.ModelSerializer):
         return schoolschedule
 
     def dispatch_gallery(self, schoolschedule, gallery):
+        images = list(SchoolScheduleImage.objects.filter(schoolschedule=schoolschedule).values_list('img', flat=True))
+        new_images = []
         for image in gallery:
-
+            if image.get('img'):
-            imgs = SchoolScheduleImage.objects.filter(
+                if image['img'].id not in images:
-                schoolschedule=schoolschedule,
+                    SchoolScheduleImage.objects.create(
-                img=image['img']
+                        schoolschedule=schoolschedule,
-            )
+                        img=image['img'],
-
+                    )
-            if not imgs.exists():
+                new_images.append(image['img'].id)
-                si = SchoolScheduleImage.objects.create(
+        SchoolScheduleImage.objects.filter(schoolschedule=schoolschedule, img__isnull=True).delete()
-                    schoolschedule=schoolschedule,
+        SchoolScheduleImage.objects.filter(schoolschedule=schoolschedule, img__in=set(images) - set(new_images)).delete()
-                    img=image['img'],
-                )
 
     def to_representation(self, instance):
         return SchoolScheduleSerializerImg(instance, context=self.context).to_representation(instance)

apps/course/templates/course/_items.html

@@ -8,7 +8,7 @@
     {% if course.is_deferred_start and course.status == 2 %}data-future-course data-future-course-time={{ course.deferred_start_at.timestamp }}{% endif %}
 >
 <a class="courses__preview" href="{% if course.status <= 1 %}{% url 'course_edit' course.id %}{% else %}{{ course.url }}{% endif %}">
-  {% if course.cover %}
+  {% if course.cover and course.cover.image_thumbnail %}
   <img class="courses__pic" src="{{ course.cover.image_thumbnail.url }}" width="{{ course.cover.image_thumbnail.width }}" />
   {% else %}
   <img class="courses__pic" src="{% static 'img/no_cover.png' %}" width="300px" />

apps/course/templates/course/course.html

@@ -212,7 +212,7 @@
         {% endif %}
       </div>
       <a class="course__video video" href="#">
-        {% if course.cover %}
+        {% if course.cover and course.cover.image %}
         <img class="video__pic" src="{{ course.cover.image.url }}"/>
         {% else %}
 
@@ -272,7 +272,7 @@
 {% endif %}
 <div
   class="course course_promo"
-  style="background-image: url({% if course.cover %}{{ course.cover.image.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %});"
+  style="background-image: url({% if course.cover and course.cover.image %}{{ course.cover.image.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %});"
   >
   <div class="course__center center center_sm">
     <div class="course__head">

project/templates/blocks/video.html

@@ -13,11 +13,13 @@
       </div>
     </div>
     <div class="section__column section__column_img">
-      <img class="main-video-preview js-video-modal" data-video-url="{{ config.MAIN_PAGE_VIDEO_URL|safe }}" data-trial-lesson="1"
+      {% if config.MAIN_PAGE_VIDEO_PREVIEW_IMG %}
-           src="{{ config.MAIN_PAGE_VIDEO_PREVIEW_IMG.url }}"/>
+      <img class="main-video-preview js-video-modal" data-video-url="{{ config.MAIN_PAGE_VIDEO_URL|safe|default:'' }}"
+           data-trial-lesson="1" src="{{ config.MAIN_PAGE_VIDEO_PREVIEW_IMG.url }}"/>
+      {% endif %}
       <div class="section__buttons mobile-show">
         <a href="#" class="btn btn_white js-video-modal"
-        data-video-url="{{ config.MAIN_PAGE_VIDEO_URL|safe }}" data-trial-lesson="1">Смотреть бесплатный урок
+        data-video-url="{{ config.MAIN_PAGE_VIDEO_URL|safe|default:'' }}" data-trial-lesson="1">Смотреть бесплатный урок
         <img class="emoji" src="{% static 'img/emoji-present.png' %}" /></a>
       </div>
     </div>