From: Yoan Le Clanche <yoanl@pilotsystems.net>
Date: Wed, 29 Sep 2021 11:11:06 +0000 (+0200)
Subject: Fix CourseType sort order
X-Git-Tag: 2.5.0~57
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=65734373e8058e937cd4d00398318dbfd862a475;p=teleforma.git

Fix CourseType sort order
---

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index fcbe0b58..1650316c 100755
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -212,6 +212,7 @@ class CourseType(models.Model):
     class Meta(MetaCore):
         db_table = app_label + '_' + 'course_type'
         verbose_name = _('course type')
+        ordering = ['order']
 
     def to_dict(self):
         dict = {'name': self.name,
diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 8eaa5676..ac918331 100644
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -88,7 +88,7 @@ def get_crfpa_courses(user, date_order=False, num_order=False, period=None):
     if professor:
         professor = user.professor.get()
         courses = format_courses(courses, queryset=professor.courses.all(),
-                                  types=CourseType.objects.order_by('order').all())
+                                  types=CourseType.objects.all())
 
     elif quotas and not user.is_staff:
         corrector_courses = set()
@@ -96,7 +96,7 @@ def get_crfpa_courses(user, date_order=False, num_order=False, period=None):
             corrector_courses.add(quota.course)
         for course in corrector_courses:
             courses = format_courses(courses, course=course,
-                    types=CourseType.objects.order_by('order').all())
+                    types=CourseType.objects.all())
 
     elif student:
         student = user.student.get()
@@ -138,7 +138,7 @@ def get_crfpa_courses(user, date_order=False, num_order=False, period=None):
 
     elif user.is_staff or user.is_superuser:
         courses = format_courses(courses, queryset=Course.objects.all(),
-                    types=CourseType.objects.order_by('order').all())
+                    types=CourseType.objects.all())
     else:
         courses = None