when updating the list of children of sequentials, we must use the 'direct'…

when updating the list of children of sequentials, we must use the 'direct' store otherwise we end up with draft revisions of sequentials, which is bad

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -9,7 +9,6 @@ from tempdir import mkdtemp_clean
 from fs.osfs import OSFS
 import copy
 from json import loads
-import traceback
 from datetime import timedelta
 
 from django.contrib.auth.models import User
@@ -397,7 +396,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
 
         # We had a bug where orphaned draft nodes caused export to fail. This is here to cover that case.
         draft_store.clone_item(vertical.location, Location(['i4x', 'edX', 'full',
-                                                             'vertical', 'no_references', 'draft']))
+                                                            'vertical', 'no_references', 'draft']))
 
         for child in vertical.get_children():
             draft_store.clone_item(child.location, child.location)
@@ -478,6 +477,12 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         for child in vertical.get_children():
             self.assertTrue(getattr(child, 'is_draft', False))
 
+        # make sure that we don't have a sequential that is in draft mode
+        sequential = draft_store.get_item(Location(['i4x', 'edX', 'full',
+                                                    'sequential', 'Administrivia_and_Circuit_Elements', None]))
+
+        self.assertFalse(getattr(sequential, 'is_draft', False))
+
         # verify that we have the private vertical
         test_private_vertical = draft_store.get_item(Location(['i4x', 'edX', 'full',
                                                                'vertical', 'vertical_66', None]))

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

@@ -274,7 +274,7 @@ def import_from_xml(store, data_dir, course_dirs=None,
 
             # now import any 'draft' items
             if draft_store is not None:
-                import_course_draft(xml_module_store, draft_store, course_data_path,
+                import_course_draft(xml_module_store, store, draft_store, course_data_path,
                                     static_content_store, target_location_namespace if target_location_namespace is not None
                                     else course_location)
 
@@ -339,7 +339,7 @@ def import_module(module, store, course_data_path, static_content_store, allow_n
     store.update_metadata(module.location, dict(own_metadata(module)))
 
 
-def import_course_draft(xml_module_store, store, course_data_path, static_content_store, target_location_namespace):
+def import_course_draft(xml_module_store, store, draft_store, course_data_path, static_content_store, target_location_namespace):
     '''
     This will import all the content inside of the 'drafts' folder, if it exists
     NOTE: This is not a full course import, basically in our current application only verticals (and downwards)
@@ -396,7 +396,7 @@ def import_course_draft(xml_module_store, store, course_data_path, static_conten
                             del module.xml_attributes['parent_sequential_url']
                             del module.xml_attributes['index_in_children_list']
 
-                        import_module(module, store, course_data_path, static_content_store, allow_not_found=True)
+                        import_module(module, draft_store, course_data_path, static_content_store, allow_not_found=True)
                         for child in module.get_children():
                             _import_module(child)