Merge branch 'master' into fix/use-masqueraded-user-for-course-outline

Author: hiteshkava

cms/djangoapps/contentstore/rest_api/v2/serializers/home.py

@@ -30,7 +30,9 @@ class CourseCommonSerializerV2(serializers.Serializer):
     lms_link = serializers.SerializerMethodField()
     cms_link = serializers.SerializerMethodField()
     number = serializers.CharField()
+    display_number = serializers.CharField(source='display_number_with_default')
     org = serializers.CharField()
+    display_org = serializers.CharField(source='display_org_with_default')
     rerun_link = serializers.SerializerMethodField()
     run = serializers.CharField(source='id.run')
     url = serializers.SerializerMethodField()

cms/djangoapps/contentstore/rest_api/v2/views/tests/test_home.py

@@ -56,8 +56,10 @@ def test_home_page_response(self):
                     ("display_name", self.course.display_name),
                     ("lms_link", f'{settings.LMS_ROOT_URL}/courses/{course_id}/jump_to/{self.course.location}'),
                     ("cms_link", f'//{settings.CMS_BASE}{reverse_course_url("course_handler", self.course.id)}'),
-                    ("number", self.course.number),
-                    ("org", self.course.org),
+                    ("number", self.active_course.number),
+                    ("display_number", self.active_course.display_number_with_default),
+                    ("org", self.active_course.org),
+                    ("display_org", self.active_course.display_org_with_default),
                     ("rerun_link", f'/course_rerun/{course_id}'),
                     ("run", self.course.id.run),
                     ("url", f'/course/{course_id}'),
@@ -75,7 +77,9 @@ def test_home_page_response(self):
                         f'//{settings.CMS_BASE}{reverse_course_url("course_handler", self.archived_course.id)}',
                     ),
                     ("number", self.archived_course.number),
+                    ("display_number", self.archived_course.display_number_with_default),
                     ("org", self.archived_course.org),
+                    ("display_org", self.archived_course.display_org_with_default),
                     ("rerun_link", f'/course_rerun/{str(self.archived_course.id)}'),
                     ("run", self.archived_course.id.run),
                     ("url", f'/course/{str(self.archived_course.id)}'),
@@ -109,8 +113,10 @@ def test_active_only_query_if_passed(self):
             ("display_name", self.course.display_name),
             ("lms_link", f'{settings.LMS_ROOT_URL}/courses/{str(self.course.id)}/jump_to/{self.course.location}'),
             ("cms_link", f'//{settings.CMS_BASE}{reverse_course_url("course_handler", self.course.id)}'),
-            ("number", self.course.number),
-            ("org", self.course.org),
+            ("number", self.active_course.number),
+            ("display_number", self.active_course.display_number_with_default),
+            ("org", self.active_course.org),
+            ("display_org", self.active_course.display_org_with_default),
             ("rerun_link", f'/course_rerun/{str(self.course.id)}'),
             ("run", self.course.id.run),
             ("url", f'/course/{str(self.course.id)}'),
@@ -140,7 +146,9 @@ def test_archived_only_query_if_passed(self):
             ),
             ("cms_link", f'//{settings.CMS_BASE}{reverse_course_url("course_handler", self.archived_course.id)}'),
             ("number", self.archived_course.number),
+            ("display_number", self.archived_course.display_number_with_default),
             ("org", self.archived_course.org),
+            ("display_org", self.archived_course.display_org_with_default),
             ("rerun_link", f'/course_rerun/{str(self.archived_course.id)}'),
             ("run", self.archived_course.id.run),
             ("url", f'/course/{str(self.archived_course.id)}'),
@@ -170,7 +178,9 @@ def test_search_query_if_passed(self):
             ),
             ("cms_link", f'//{settings.CMS_BASE}{reverse_course_url("course_handler", self.archived_course.id)}'),
             ("number", self.archived_course.number),
+            ("display_number", self.archived_course.display_number_with_default),
             ("org", self.archived_course.org),
+            ("display_org", self.archived_course.display_org_with_default),
             ("rerun_link", f'/course_rerun/{str(self.archived_course.id)}'),
             ("run", self.archived_course.id.run),
             ("url", f'/course/{str(self.archived_course.id)}'),

cms/static/sass/elements/_modal-window.scss

@@ -409,13 +409,16 @@
     div.edit-xblock-modal {
       display: flex;
       flex-direction: column;
+      min-height: 0;
       flex-grow: 1;
 
       div.modal-content {
         display: flex;
         flex-direction: column;
-        flex-grow: 1;
+        flex: 1;
+        min-height: 0;
         padding: 0;
+        overflow: auto;
 
         div.xblock-editor {
           display: flex;