Fix CourseType sort order

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index fcbe0b580ec5ca9646386d46dc8dcb4626f59021..1650316c9239621b956904000c697d93bdff421f 100755 (executable)
--- 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 8eaa56767caa777864aa25bd2ee89018adf3dae0..ac918331404ccd05b4df9ed24c7e2a41b2a43f4c 100644 (file)
--- 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