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

Merge pull request #1714 from edx/christina/fix-children

Browse Source 
The forcing of IDs to non-draft must happen in base.py instead of draft....
This commit is contained in:
Christina Roberts
2013-11-19 11:18:54 -08:00
parent 9206f33f30 705ccd01bc
commit d4082859f8
4 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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):
"""