Merge pull request #270 from edx/sorting-fix

Fixed Sorting Bug on Course Index Page

analytics_dashboard/courses/tests/test_views/test_pages.py

@@ -34,7 +34,7 @@ class CourseIndexViewTests(CourseAPIMixin, ViewTestMixin, MiddlewareAssertionMix
     def setUp(self):
         super(CourseIndexViewTests, self).setUp()
         self.grant_permission(self.user, DEMO_COURSE_ID, DEPRECATED_DEMO_COURSE_ID)
-        self.courses = self._create_course_list(DEMO_COURSE_ID, DEPRECATED_DEMO_COURSE_ID)
+        self.courses = self._create_course_list(DEPRECATED_DEMO_COURSE_ID, DEMO_COURSE_ID)
 
     def assertCourseListEquals(self, courses):
         response = self.client.get(self.path())
@@ -47,6 +47,7 @@ class CourseIndexViewTests(CourseAPIMixin, ViewTestMixin, MiddlewareAssertionMix
 
     def test_get(self):
         """ If the user is authorized, the view should return a list of all accessible courses. """
+        self.courses.sort(key=lambda course: (course['name'] or course['key'] or '').lower())
         self.assertCourseListEquals(self.courses)
 
     def test_get_with_mixed_permissions(self):

analytics_dashboard/courses/views/__init__.py

@@ -522,7 +522,6 @@ class CourseIndex(CourseAPIMixin, LoginRequiredMixin, TrackedViewMixin, LazyEnco
             raise PermissionDenied
 
         courses = self._create_course_list(courses)
-        courses = sorted(courses, key=lambda course: course.get('name', course.get('key')))
         context['courses'] = courses
         context['page_data'] = self.get_page_data(context)
 
@@ -544,4 +543,6 @@ class CourseIndex(CourseAPIMixin, LoginRequiredMixin, TrackedViewMixin, LazyEnco
         for course_id in course_ids:
             info.append({'key': course_id, 'name': course_data.get(course_id)})
 
+        info.sort(key=lambda course: (course.get('name', '') or course.get('key', '') or '').lower())
+
         return info