diff --git a/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py b/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py index 3a09e6cdda..18e52781e5 100644 --- a/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py +++ b/lms/djangoapps/discussion/django_comment_client/tests/test_utils.py @@ -882,60 +882,6 @@ class CategoryMapTestCase(CategoryMapTestMixin, ModuleStoreTestCase): } ) - def test_sort_alpha(self): - self.course.discussion_sort_alpha = True - self.create_discussion("Chapter", "Discussion D") - self.create_discussion("Chapter", "Discussion A") - self.create_discussion("Chapter", "Discussion E") - self.create_discussion("Chapter", "Discussion C") - self.create_discussion("Chapter", "Discussion B") - - self.assert_category_map_equals( - { - "entries": {}, - "subcategories": { - "Chapter": { - "entries": { - "Discussion D": { - "id": "discussion1", - "sort_key": "Discussion D", - "is_divided": False, - }, - "Discussion A": { - "id": "discussion2", - "sort_key": "Discussion A", - "is_divided": False, - }, - "Discussion E": { - "id": "discussion3", - "sort_key": "Discussion E", - "is_divided": False, - }, - "Discussion C": { - "id": "discussion4", - "sort_key": "Discussion C", - "is_divided": False, - }, - "Discussion B": { - "id": "discussion5", - "sort_key": "Discussion B", - "is_divided": False, - } - }, - "subcategories": {}, - "children": [ - ("Discussion A", TYPE_ENTRY), - ("Discussion B", TYPE_ENTRY), - ("Discussion C", TYPE_ENTRY), - ("Discussion D", TYPE_ENTRY), - ("Discussion E", TYPE_ENTRY) - ] - } - }, - "children": [("Chapter", TYPE_SUBCATEGORY)] - } - ) - def test_sort_intermediates(self): self.create_discussion("Chapter B", "Discussion 2") self.create_discussion("Chapter C", "Discussion") diff --git a/lms/djangoapps/discussion/django_comment_client/utils.py b/lms/djangoapps/discussion/django_comment_client/utils.py index b74920a4fa..1de0035c9d 100644 --- a/lms/djangoapps/discussion/django_comment_client/utils.py +++ b/lms/djangoapps/discussion/django_comment_client/utils.py @@ -465,7 +465,7 @@ def get_discussion_category_map(course, user, divided_only_if_explicit=False, ex ) } - _sort_map_entries(category_map, course.discussion_sort_alpha) + _sort_map_entries(category_map, False) return _filter_unstarted_categories(category_map, course) if exclude_unstarted else category_map diff --git a/xmodule/course_module.py b/xmodule/course_module.py index b1f09b57a4..d78e871e34 100644 --- a/xmodule/course_module.py +++ b/xmodule/course_module.py @@ -404,14 +404,6 @@ class CourseFields: # lint-amnesty, pylint: disable=missing-class-docstring ), scope=Scope.settings ) - discussion_sort_alpha = Boolean( - display_name=_("Discussion Sorting Alphabetical"), - scope=Scope.settings, default=False, - help=_( - "Enter true or false. If true, discussion categories and subcategories are sorted alphabetically. " - "If false, they are sorted chronologically by creation date and time." - ) - ) discussions_settings = Dict( display_name=_("Discussions Plugin Settings"), scope=Scope.settings,