From 212d40b6a0dfa77b8a677dd9523e0069647e4812 Mon Sep 17 00:00:00 2001 From: gzbender Date: Wed, 15 May 2019 12:48:41 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B8=D1=81=D0=BE=D0=B2=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BB=D0=B0=D0=B3=D0=B5=D1=80=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/school/templates/blocks/schedule.html | 6 +++++- apps/school/templates/drawing_camp/schedule_purchased.html | 6 +----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/school/templates/blocks/schedule.html b/apps/school/templates/blocks/schedule.html index daa59d34..1207685d 100644 --- a/apps/school/templates/blocks/schedule.html +++ b/apps/school/templates/blocks/schedule.html @@ -6,7 +6,11 @@
{% for school_schedule in school_schedules_sorted %} - {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson purchased=True %} + {% if is_drawing_camp %} + {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_camp_lesson purchased=True %} + {% else %} + {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson purchased=True %} + {% endif %} {% endfor %}
diff --git a/apps/school/templates/drawing_camp/schedule_purchased.html b/apps/school/templates/drawing_camp/schedule_purchased.html index 5027b320..15b11875 100644 --- a/apps/school/templates/drawing_camp/schedule_purchased.html +++ b/apps/school/templates/drawing_camp/schedule_purchased.html @@ -37,11 +37,7 @@
Новые уроки
{% for school_schedule in school_schedules_sorted %} - {% if is_drawing_camp %} - {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_camp_lesson %} - {% else %} - {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson %} - {% endif %} + {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_camp_lesson %} {% endfor %} {% if prev_live_lessons_exists %}
Прошедшие уроки