Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The forcing of IDs to non-draft must happen in base.py instead of draft.py.

Browse Source 
The draft.py solution only worked when the parent was also in the draft store.
This commit is contained in:
cahrens
2013-11-19 12:08:29 -05:00
parent afaf0f576e
commit ed9a61e2d9
3 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
cms/djangoapps/contentstore/tests/test_item.py
View File

@@ -22,9 +22,9 @@ class ItemTest(CourseTestCase):
def get_old_id(self, locator):
"""
Converts new locator to old id format.
Converts new locator to old id format (forcing to non-draft).
"""
return loc_mapper().translate_locator_to_location(BlockUsageLocator(locator))
return loc_mapper().translate_locator_to_location(BlockUsageLocator(locator)).replace(revision=None)
def get_item_from_modulestore(self, locator, draft=False):
"""
@@ -197,7 +197,10 @@ class TestEditItem(ItemTest):
self.assertEqual(sequential.due, datetime.datetime(2010, 11, 22, 4, 0, tzinfo=UTC))
self.assertEqual(sequential.start, datetime.datetime(2010, 9, 12, 14, 0, tzinfo=UTC))
def test_children(self):
def test_delete_child(self):
"""
Test deleting a child.
"""
# Create 2 children of main course.
resp_1 = self.create_xblock(display_name='child 1', category='chapter')
resp_2 = self.create_xblock(display_name='child 2', category='chapter')
@@ -219,3 +222,32 @@ class TestEditItem(ItemTest):
course = self.get_item_from_modulestore(self.unicode_locator)
self.assertNotIn(self.get_old_id(chapter1_locator).url(), course.children)
self.assertIn(self.get_old_id(chapter2_locator).url(), course.children)
def test_reorder_children(self):
"""
Test reordering children that can be in the draft store.
"""
# Create 2 child units and re-order them. There was a bug about @draft getting added
# to the IDs.
unit_1_resp = self.create_xblock(parent_locator=self.seq_locator, category='vertical')
unit_2_resp = self.create_xblock(parent_locator=self.seq_locator, category='vertical')
unit1_locator = self.response_locator(unit_1_resp)
unit2_locator = self.response_locator(unit_2_resp)
# The sequential already has a child defined in the setUp (a problem).
# Children must be on the sequential to reproduce the original bug,
# as it is important that the parent (sequential) NOT be in the draft store.
children = self.get_item_from_modulestore(self.seq_locator).children
self.assertEqual(self.get_old_id(unit1_locator).url(), children[1])
self.assertEqual(self.get_old_id(unit2_locator).url(), children[2])
resp = self.client.ajax_post(
self.seq_update_url,
data={'children': [self.problem_locator, unit2_locator, unit1_locator]}
)
self.assertEqual(resp.status_code, 200)
children = self.get_item_from_modulestore(self.seq_locator).children
self.assertEqual(self.get_old_id(self.problem_locator).url(), children[0])
self.assertEqual(self.get_old_id(unit1_locator).url(), children[2])
self.assertEqual(self.get_old_id(unit2_locator).url(), children[1])

6
common/lib/xmodule/xmodule/modulestore/mongo/base.py
View File

@@ -778,7 +778,11 @@ class MongoModuleStore(ModuleStoreWriteBase):
children: A list of child item identifiers
"""
self._update_single_item(location, {'definition.children': children})
# We expect the children IDs to always be the non-draft version. With view refactoring
# for split, we are now passing the draft version in some cases.
children_ids = [Location(child).replace(revision=None).url() for child in children]
self._update_single_item(location, {'definition.children': children_ids})
# recompute (and update) the metadata inheritance tree which is cached
self.refresh_cached_metadata_inheritance_tree(Location(location))
# fire signal that we've written to DB

7
common/lib/xmodule/xmodule/modulestore/mongo/draft.py
View File

@@ -184,17 +184,12 @@ class DraftModuleStore(MongoModuleStore):
location: Something that can be passed to Location
children: A list of child item identifiers
"""
# We expect the children IDs to always be the non-draft version. With view refactoring
# for split, we are now passing the draft version in some cases.
children_ids = [as_published(child).url() for child in children]
draft_loc = as_draft(location)
draft_item = self.get_item(location)
if not getattr(draft_item, 'is_draft', False):
self.convert_to_draft(as_published(location))
return super(DraftModuleStore, self).update_children(draft_loc, children_ids)
return super(DraftModuleStore, self).update_children(draft_loc, children)
def update_metadata(self, location, metadata):
"""