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

ooops. didn't clean up the merge conflicts

Browse Source
This commit is contained in:
Chris Dodge
2013-03-20 14:32:18 -04:00
parent 8849ce084f
commit 5dbb153abe
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/lib/xmodule/xmodule/modulestore/mongo.py
View File

@@ -622,11 +622,7 @@ class MongoModuleStore(ModuleStoreBase):
self._update_single_item(location, {'metadata': metadata})
# recompute (and update) the metadata inheritance tree which is cached
<<<<<<< HEAD
self.refresh_cached_metadata_inheritance_tree(loc)
=======
self.get_cached_metadata_inheritance_tree(loc, force_refresh = True)
>>>>>>> fbd409c914c2dc005fd6b46af6daaee262205e0e
def delete_item(self, location):
"""
@@ -649,12 +645,7 @@ class MongoModuleStore(ModuleStoreBase):
# from overriding our default value set in the init method.
safe=self.collection.safe)
# recompute (and update) the metadata inheritance tree which is cached
<<<<<<< HEAD
self.refresh_cached_metadata_inheritance_tree(Location(location))
=======
self.get_cached_metadata_inheritance_tree(Location(location), force_refresh = True)
>>>>>>> fbd409c914c2dc005fd6b46af6daaee262205e0e
def get_parent_locations(self, location, course_id):
'''Find all locations that are the parents of this location in this