Download as
Browse Code »

Commit 2e247b7774e6f3fe57d17c7b6d261208734a753f

Authored by Gustavo Bernardo
1 parent 707b27ef
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Ordering CategoryCourses properly now by name

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
courses/views.py
  Diff comments   View file @2e247b7
@@ -56,7 +56,7 @@ def course_category(list_courses): @@ -56,7 +56,7 @@ def course_category(list_courses):
56 if (cat): 56 if (cat):
57 categorys_courses.append(cat) 57 categorys_courses.append(cat)
58 58
59 - return categorys_courses 59 + return sorted(list(categorys_courses),key = lambda x:x.name)
60 60
61 class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView): 61 class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
62 62
@@ -93,10 +93,10 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView): @@ -93,10 +93,10 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
93 list_courses = self.get_queryset().order_by('name') 93 list_courses = self.get_queryset().order_by('name')
94 # categorys_courses = CourseCategory.objects.all() 94 # categorys_courses = CourseCategory.objects.all()
95 elif has_role(self.request.user,'professor'): 95 elif has_role(self.request.user,'professor'):
96 - list_courses = self.get_queryset().filter(professors__in = [self.request.user]) 96 + list_courses = self.get_queryset().filter(professors__in = [self.request.user]).order_by('name')
97 # categorys_courses = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct() 97 # categorys_courses = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct()
98 elif has_role(self.request.user, 'student'): 98 elif has_role(self.request.user, 'student'):
99 - list_courses = self.get_queryset().filter(students__in = [self.request.user]) 99 + list_courses = self.get_queryset().filter(students__in = [self.request.user]).order_by('name')
100 100
101 context['categorys_courses'] = course_category(list_courses) 101 context['categorys_courses'] = course_category(list_courses)
102 return context 102 return context
@@ -136,6 +136,7 @@ class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView): @@ -136,6 +136,7 @@ class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView):
136 list_courses = self.get_queryset() 136 list_courses = self.get_queryset()
137 137
138 context['categorys_courses'] = course_category(list_courses) 138 context['categorys_courses'] = course_category(list_courses)
  139 +
139 return context 140 return context
140 141
141 class CreateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin, generic.edit.CreateView): 142 class CreateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin, generic.edit.CreateView):