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

Rename XModule[Descriptor].type to .category to be parallel to Location

Browse Source
This commit is contained in:
Calen Pennington
2012-07-02 09:01:08 -04:00
parent 7b78fa5278
commit 7ac8fecb38
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/djangoapps/courseware/grades.py
View File

@@ -146,9 +146,9 @@ def get_score(user, problem, cache):
correct = 0.0
# If the ID is not in the cache, add the item
instance_module = cache.lookup(problem.type, problem.id)
instance_module = cache.lookup(problem.category, problem.id)
if instance_module is None:
instance_module = StudentModule(module_type=problem.type,
instance_module = StudentModule(module_type=problem.category,
module_state_key=problem.id,
student=user,
state=None,

10
lms/djangoapps/courseware/module_render.py
View File

@@ -207,10 +207,10 @@ def get_module(user, request, location, student_module_cache, position=None):
'''
descriptor = keystore().get_item(location)
instance_module = student_module_cache.lookup(descriptor.type, descriptor.url)
instance_module = student_module_cache.lookup(descriptor.category, descriptor.url)
shared_state_key = getattr(descriptor, 'shared_state_key', None)
if shared_state_key is not None:
shared_module = student_module_cache.lookup(descriptor.type, shared_state_key)
shared_module = student_module_cache.lookup(descriptor.category, shared_state_key)
else:
shared_module = None
@@ -246,7 +246,7 @@ def get_module(user, request, location, student_module_cache, position=None):
if not instance_module:
instance_module = StudentModule(
student=user,
module_type=descriptor.type,
module_type=descriptor.category,
module_state_key=module.id,
state=module.get_instance_state(),
max_grade=module.max_score())
@@ -257,13 +257,13 @@ def get_module(user, request, location, student_module_cache, position=None):
if not shared_module and shared_state_key is not None:
shared_module = StudentModule(
student=user,
module_type=descriptor.type,
module_type=descriptor.category,
module_state_key=shared_state_key,
state=module.get_shared_state())
shared_module.save()
student_module_cache.append(shared_module)
return (module, instance_module, shared_module, descriptor.type)
return (module, instance_module, shared_module, descriptor.category)
def add_histogram(module):