From 8afe211974e14073cbd00c9e91722e42e8e00dde Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 27 Apr 2017 16:25:49 +0200 Subject: [PATCH] Fix media copy rules --- .../management/commands/teleforma-copy-conferences.py | 6 +++++- teleforma/templates/teleforma/courses.html | 10 +++++++++- teleforma/templates/teleforma/inc/media_list.html | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/teleforma/management/commands/teleforma-copy-conferences.py b/teleforma/management/commands/teleforma-copy-conferences.py index 02a857fb..e51b3142 100644 --- a/teleforma/management/commands/teleforma-copy-conferences.py +++ b/teleforma/management/commands/teleforma-copy-conferences.py @@ -28,14 +28,18 @@ class Command(BaseCommand): courses = ['OB','PAC','PC','PP','DA','Affaires','DIE','Civil','Penal','Social'] period_1_name = 'Semestrielle' period_2_name = 'Pré-Estivale' + course_type = 'Cours' def handle(self, *args, **options): period_1 = Period.objects.get(name=self.period_1_name) period_2 = Period.objects.get(name=self.period_2_name) + course_type = CourseType.objects.get(name=course_type) + for course in self.courses: - medias = Media.objects.filter(period=period_1, course=course) + medias = Media.objects.filter(period=period_1, course=course, type=course_type) for media in medias: media.pk = None media.save() media.period = period_2 + media.is_published = False media.save() diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html index ef354ec1..55bbd04a 100644 --- a/teleforma/templates/teleforma/courses.html +++ b/teleforma/templates/teleforma/courses.html @@ -88,7 +88,15 @@ $(document).ready(function(){ {% endblock %} {% block media %} - {% include "teleforma/inc/media_list.html" %} + {% with "Passed conferences" as title %} + {% include "teleforma/inc/media_list.html" %} + {% endwith %} + {% endblock %} + + {% block media %} + {% with "Web class" as title %} + {% include "teleforma/inc/media_list.html" %} + {% endwith %} {% endblock %} {% block document %} diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html index 95b3a799..afde6ad0 100644 --- a/teleforma/templates/teleforma/inc/media_list.html +++ b/teleforma/templates/teleforma/inc/media_list.html @@ -5,7 +5,7 @@ {% if course.media.all|from_course_type:type|from_period:period %}
-

{% trans "Passed conferences"%}

+

{% trans title %}

-- 2.39.5