From 6bb0072f11d0fb5ed9077f337e106e67005d13e9 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 11 Jul 2013 18:00:35 +0200 Subject: [PATCH] fix course format --- teleforma/views/crfpa.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py index 18107a19..cbd1d482 100644 --- a/teleforma/views/crfpa.py +++ b/teleforma/views/crfpa.py @@ -53,7 +53,7 @@ def get_crfpa_courses(user, date_order=False, num_order=False, period=None): if professor: professor = user.professor.get() - courses = format_crfpa_courses(courses, queryset=professor.courses.all(), + courses = format_courses(courses, queryset=professor.courses.all(), types=CourseType.objects.all()) elif student: @@ -71,29 +71,29 @@ def get_crfpa_courses(user, date_order=False, num_order=False, period=None): } for course in s_courses: - courses = format_crfpa_courses(courses, course=course, + courses = format_courses(courses, course=course, types=s_courses[course]) synthesis_note = training.synthesis_note if synthesis_note: - courses = format_crfpa_courses(courses, + courses = format_courses(courses, queryset=Course.objects.filter(synthesis_note=True), types=synthesis_note) obligation = training.obligation if obligation: - courses = format_crfpa_courses(courses, + courses = format_courses(courses, queryset=Course.objects.filter(obligation=True), types=obligation) magistral = training.magistral if magistral: - courses = format_crfpa_courses(courses, + courses = format_courses(courses, queryset=Course.objects.filter(magistral=True), types=magistral) elif user.is_staff or user.is_superuser: - courses = format_crfpa_courses(courses, queryset=Course.objects.all(), + courses = format_courses(courses, queryset=Course.objects.all(), types=CourseType.objects, admin=True) else: courses = None -- 2.39.5