Merge branch 'master' into rpenido/fal-3621-paste-tags-when-pasting-x…

…blocks-with-tag-data
openedx · Feb 29, 2024 · 24c4729 · 24c4729
2 parents dacba7d + ea55eca
commit 24c4729
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 5 deletions.
diff --git a/lms/djangoapps/course_home_api/course_metadata/serializers.py b/lms/djangoapps/course_home_api/course_metadata/serializers.py
@@ -29,6 +29,14 @@ def get_url(self, tab):
         return request.build_absolute_uri(tab.link_func(self.context.get('course'), reverse))
 
 
+class CourseModeSerrializer(serializers.Serializer):
+    """
+    Serializer for the Course Mode
+    """
+    slug = serializers.CharField()
+    name = serializers.CharField()
+
+
 class CourseHomeMetadataSerializer(VerifiedModeSerializer):
     """
     Serializer for the Course Home Course Metadata
@@ -48,3 +56,4 @@ class CourseHomeMetadataSerializer(VerifiedModeSerializer):
     username = serializers.CharField()
     user_timezone = serializers.CharField()
     can_view_certificate = serializers.BooleanField()
+    course_modes = CourseModeSerrializer(many=True)
diff --git a/lms/djangoapps/course_home_api/course_metadata/views.py b/lms/djangoapps/course_home_api/course_metadata/views.py
@@ -14,6 +14,7 @@
 from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
 from openedx.core.djangoapps.courseware_api.utils import get_celebrations_dict
 
+from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.student.models import CourseEnrollment
 from lms.djangoapps.course_api.api import course_detail
 from lms.djangoapps.course_goals.models import UserActivity
@@ -117,6 +118,8 @@ def get(self, request, *args, **kwargs):
         # Record course goals user activity for (web) learning mfe course tabs
         UserActivity.record_user_activity(request.user, course_key)
 
+        course_modes = CourseMode.modes_for_course(course_key, include_expired=True, only_selectable=False)
+
         data = {
             'course_id': course.id,
             'username': username,
@@ -133,6 +136,7 @@ def get(self, request, *args, **kwargs):
             'celebrations': celebrations,
             'user_timezone': user_timezone,
             'can_view_certificate': certificates_viewable_for_course(course),
+            'course_modes': course_modes,
         }
         context = self.get_serializer_context()
         context['course'] = course

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -23,7 +23,7 @@ click>=8.0,<9.0
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==4.12.6
+edx-enterprise==4.13.0
 
 # Stay on LTS version, remove once this is added to common constraint
 Django<5.0

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -477,7 +477,7 @@ edx-drf-extensions==10.2.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.12.6
+edx-enterprise==4.13.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -751,7 +751,7 @@ edx-drf-extensions==10.2.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.12.6
+edx-enterprise==4.13.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt

diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
@@ -551,7 +551,7 @@ edx-drf-extensions==10.2.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.12.6
+edx-enterprise==4.13.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -577,7 +577,7 @@ edx-drf-extensions==10.2.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.12.6
+edx-enterprise==4.13.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt