From 690d97f28b51e2f6da93d09265680e8652e1637e Mon Sep 17 00:00:00 2001 From: Rocky Duan Date: Tue, 7 Aug 2012 18:49:59 -0400 Subject: [PATCH] fixed merge bugs --- lms/djangoapps/django_comment_client/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/django_comment_client/utils.py b/lms/djangoapps/django_comment_client/utils.py index b2e6758b6b..6c9d35b4a3 100644 --- a/lms/djangoapps/django_comment_client/utils.py +++ b/lms/djangoapps/django_comment_client/utils.py @@ -65,7 +65,7 @@ def initialize_discussion_info(request, course): def _get_module(module_descriptor): print module_descriptor - module = get_module(user, request, module_descriptor.location, student_module_cache)[0] + module = get_module(user, request, module_descriptor.location, student_module_cache) return module def _extract_info(module): @@ -82,7 +82,7 @@ def initialize_discussion_info(request, course): filter(_is_course_discussion, get_full_modules().items())) - student_module_cache = StudentModuleCache(user, course) + student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(user, course) discussion_info = map(_extract_info, map(_get_module, discussion_module_descriptors))