Merge pull request #13286 from edx/mrehan/plat-1046-update-lib-children-on-branches

PLAT-1046 – update library content block's children on branches

cms/djangoapps/contentstore/views/tests/test_import_export.py

@@ -756,7 +756,7 @@ class TestCourseExportImport(LibraryTestCase):
 
         return self.get_lib_content_block_children(self.store.get_item(block_location).children[0])
 
-    def assert_problem_display_names(self, source_course_location, dest_course_location):
+    def assert_problem_display_names(self, source_course_location, dest_course_location, is_published):
         """
         Asserts that problems' display names in both source and destination courses are same.
         """
@@ -766,6 +766,19 @@ class TestCourseExportImport(LibraryTestCase):
         self.assertEquals(len(source_course_lib_children), len(dest_course_lib_children))
 
         for source_child_location, dest_child_location in zip(source_course_lib_children, dest_course_lib_children):
+            # Assert problem names on draft branch.
+            with self.store.branch_setting(branch_setting=ModuleStoreEnum.Branch.draft_preferred):
+                self.assert_names(source_child_location, dest_child_location)
+
+            if is_published:
+                # Assert problem names on publish branch.
+                with self.store.branch_setting(branch_setting=ModuleStoreEnum.Branch.published_only):
+                    self.assert_names(source_child_location, dest_child_location)
+
+    def assert_names(self, source_child_location, dest_child_location):
+        """
+        Check if blocks have same display_name.
+        """
         source_child = self.store.get_item(source_child_location)
         dest_child = self.store.get_item(dest_child_location)
         self.assertEquals(source_child.display_name, dest_child.display_name)
@@ -805,5 +818,6 @@ class TestCourseExportImport(LibraryTestCase):
 
         self.assert_problem_display_names(
             self.source_course.location,
-            dest_course.location
+            dest_course.location,
+            publish_item
         )

common/lib/xmodule/xmodule/modulestore/xml_importer.py

@@ -753,12 +753,19 @@ def _update_and_import_module(
         # if library exists, update source_library_version and children
         # according to this existing library and library content block.
         if store.get_library(block.source_library_key):
+
+            # Update library content block's children on draft branch
+            with store.branch_setting(branch_setting=ModuleStoreEnum.Branch.draft_preferred):
                 LibraryToolsService(store).update_children(
                     block,
                     user_id,
                     version=block.source_library_version
                 )
 
+            # Publish it if importing the course for branch setting published_only.
+            if store.get_branch_setting() == ModuleStoreEnum.Branch.published_only:
+                store.publish(block.location, user_id)
+
     return block