Merge master

2012-08-15 15:19:08 -04:00
parent 02d970c31e 13b9e58f8f
commit 3c1e67e339
19 changed files with 285 additions and 46 deletions
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -320,8 +320,8 @@ def xqueue_callback(request, course_id, userid, id, dispatch):
    user = User.objects.get(id=userid)

    student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
-        user, modulestore().get_item(id), depth=0, acquire_lock=True)
-    instance = get_module(user, request, id, student_module_cache, course_id=course_id)
+        user, modulestore().get_item(id), depth=0, select_for_update=True)
+    instance = get_module(user, request, id, student_module_cache)
    if instance is None:
        log.debug("No module {} for user {}--access denied?".format(id, user))
        raise Http404